@@ -246,6 +246,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
246
246
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -crates-exec \
247
247
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -bench-exec \
248
248
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -debuginfo-exec \
249
+ check-stage$(1 ) -T-$(2 ) -H-$(3 ) -codegen-exec \
249
250
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -doc-exec \
250
251
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -pretty-exec
251
252
@@ -430,6 +431,8 @@ CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
430
431
BENCH_RS := $(wildcard $(S ) src/test/bench/* .rs)
431
432
PRETTY_RS := $(wildcard $(S ) src/test/pretty/* .rs)
432
433
DEBUGINFO_RS := $(wildcard $(S ) src/test/debug-info/* .rs)
434
+ CODEGEN_RS := $(wildcard $(S ) src/test/codegen/* .rs)
435
+ CODEGEN_CC := $(wildcard $(S ) src/test/codegen/* .cc)
433
436
434
437
# perf tests are the same as bench tests only they run under
435
438
# a performance monitor.
@@ -443,6 +446,7 @@ BENCH_TESTS := $(BENCH_RS)
443
446
PERF_TESTS := $(PERF_RS )
444
447
PRETTY_TESTS := $(PRETTY_RS )
445
448
DEBUGINFO_TESTS := $(DEBUGINFO_RS )
449
+ CODEGEN_TESTS := $(CODEGEN_RS ) $(CODEGEN_CC )
446
450
447
451
CTEST_SRC_BASE_rpass = run-pass
448
452
CTEST_BUILD_BASE_rpass = run-pass
@@ -479,10 +483,19 @@ CTEST_BUILD_BASE_debuginfo = debug-info
479
483
CTEST_MODE_debuginfo = debug-info
480
484
CTEST_RUNTOOL_debuginfo = $(CTEST_RUNTOOL )
481
485
486
+ CTEST_SRC_BASE_codegen = codegen
487
+ CTEST_BUILD_BASE_codegen = codegen
488
+ CTEST_MODE_codegen = codegen
489
+ CTEST_RUNTOOL_codegen = $(CTEST_RUNTOOL )
490
+
482
491
ifeq ($(CFG_GDB ) ,)
483
492
CTEST_DISABLE_debuginfo = "no gdb found"
484
493
endif
485
494
495
+ ifeq ($(CFG_CLANG ) ,)
496
+ CTEST_DISABLE_codegen = "no clang found"
497
+ endif
498
+
486
499
ifeq ($(CFG_OSTYPE ) ,apple-darwin)
487
500
CTEST_DISABLE_debuginfo = "gdb on darwing needs root"
488
501
endif
@@ -507,6 +520,8 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
507
520
--compile-lib-path $$(HLIB$(1 ) _H_$(3 ) ) \
508
521
--run-lib-path $$(TLIB$(1 ) _T_$(2 ) _H_$(3 ) ) \
509
522
--rustc-path $$(HBIN$(1 ) _H_$(3 ) ) /rustc$$(X_$(3 ) ) \
523
+ --clang-path $(if $(CFG_CLANG ) ,$(CFG_CLANG ) ,clang) \
524
+ --llvm-bin-path $(CFG_LLVM_INST_DIR_$(CFG_BUILD_TRIPLE ) ) /bin \
510
525
--aux-base $$(S ) src/test/auxiliary/ \
511
526
--stage-id stage$(1 ) -$(2 ) \
512
527
--target $(2 ) \
@@ -522,6 +537,7 @@ CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
522
537
CTEST_DEPS_bench_$(1 ) -T-$(2 ) -H-$(3 ) = $$(BENCH_TESTS )
523
538
CTEST_DEPS_perf_$(1 ) -T-$(2 ) -H-$(3 ) = $$(PERF_TESTS )
524
539
CTEST_DEPS_debuginfo_$(1 ) -T-$(2 ) -H-$(3 ) = $$(DEBUGINFO_TESTS )
540
+ CTEST_DEPS_codegen_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CODEGEN_TESTS )
525
541
526
542
endef
527
543
@@ -565,7 +581,7 @@ endif
565
581
566
582
endef
567
583
568
- CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo
584
+ CTEST_NAMES = rpass rpass-full rfail cfail bench perf debuginfo codegen
569
585
570
586
$(foreach host,$(CFG_HOST_TRIPLES), \
571
587
$(eval $(foreach target,$(CFG_TARGET_TRIPLES), \
@@ -674,6 +690,7 @@ TEST_GROUPS = \
674
690
bench \
675
691
perf \
676
692
debuginfo \
693
+ codegen \
677
694
doc \
678
695
$(foreach docname,$(DOC_TEST_NAMES ) ,doc-$(docname ) ) \
679
696
pretty \
0 commit comments