1
- # Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
1
+ # Copyright 2012 The Rust Project Developers. See the COPYRIGHT
2
2
# file at the top-level directory of this distribution and at
3
3
# http://rust-lang.org/COPYRIGHT.
4
4
#
@@ -184,12 +184,12 @@ check-notidy: cleantmptestlogs cleantestlibs all check-stage2
184
184
# A slightly smaller set of tests for smoke testing.
185
185
check-lite : cleantestlibs cleantmptestlogs \
186
186
$(foreach crate,$(TEST_TARGET_CRATES ) ,check-stage2-$(crate ) ) \
187
- check-stage2-rpass check-stage2-rpass-valgrind \
187
+ check-stage2-rpass \
188
188
check-stage2-rfail check-stage2-cfail check-stage2-rmake
189
189
$(Q )$(CFG_PYTHON ) $(S ) src/etc/check-summary.py tmp/* .log
190
190
191
191
# Only check the 'reference' tests: rpass/cfail/rfail/rmake.
192
- check-ref : cleantestlibs cleantmptestlogs check-stage2-rpass check-stage2-rpass-valgrind \
192
+ check-ref : cleantestlibs cleantmptestlogs check-stage2-rpass \
193
193
check-stage2-rfail check-stage2-cfail check-stage2-rmake
194
194
$(Q )$(CFG_PYTHON ) $(S ) src/etc/check-summary.py tmp/* .log
195
195
@@ -326,8 +326,7 @@ check-stage$(1)-T-$(2)-H-$(3)-exec: \
326
326
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rpass-exec \
327
327
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rfail-exec \
328
328
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-exec \
329
- check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rpass-valgrind-exec \
330
- check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rpass-full-exec \
329
+ check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rpass-full-exec \
331
330
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -cfail-full-exec \
332
331
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -rmake-exec \
333
332
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -crates-exec \
@@ -365,7 +364,6 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \
365
364
366
365
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -pretty-exec: \
367
366
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -pretty-rpass-exec \
368
- check-stage$(1 ) -T-$(2 ) -H-$(3 ) -pretty-rpass-valgrind-exec \
369
367
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -pretty-rpass-full-exec \
370
368
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -pretty-rfail-exec \
371
369
check-stage$(1 ) -T-$(2 ) -H-$(3 ) -pretty-bench-exec \
@@ -491,11 +489,15 @@ $(foreach host,$(CFG_HOST), \
491
489
# Rules for the compiletest tests (rpass, rfail, etc.)
492
490
# #####################################################################
493
491
492
+ RPASS_RC := $(wildcard $(S ) src/test/run-pass/* .rc)
494
493
RPASS_RS := $(wildcard $(S ) src/test/run-pass/* .rs)
495
- RPASS_VALGRIND_RS := $(wildcard $(S ) src/test/run-pass-valgrind /* .rs )
494
+ RPASS_FULL_RC := $(wildcard $(S ) src/test/run-pass-fulldeps /* .rc )
496
495
RPASS_FULL_RS := $(wildcard $(S ) src/test/run-pass-fulldeps/* .rs)
496
+ CFAIL_FULL_RC := $(wildcard $(S ) src/test/compile-fail-fulldeps/* .rc)
497
497
CFAIL_FULL_RS := $(wildcard $(S ) src/test/compile-fail-fulldeps/* .rs)
498
+ RFAIL_RC := $(wildcard $(S ) src/test/run-fail/* .rc)
498
499
RFAIL_RS := $(wildcard $(S ) src/test/run-fail/* .rs)
500
+ CFAIL_RC := $(wildcard $(S ) src/test/compile-fail/* .rc)
499
501
CFAIL_RS := $(wildcard $(S ) src/test/compile-fail/* .rs)
500
502
BENCH_RS := $(wildcard $(S ) src/test/bench/* .rs)
501
503
PRETTY_RS := $(wildcard $(S ) src/test/pretty/* .rs)
@@ -508,12 +510,11 @@ CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
508
510
# a performance monitor.
509
511
PERF_RS := $(wildcard $(S ) src/test/bench/* .rs)
510
512
511
- RPASS_TESTS := $(RPASS_RS )
512
- RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS )
513
- RPASS_FULL_TESTS := $(RPASS_FULL_RS )
514
- CFAIL_FULL_TESTS := $(CFAIL_FULL_RS )
515
- RFAIL_TESTS := $(RFAIL_RS )
516
- CFAIL_TESTS := $(CFAIL_RS )
513
+ RPASS_TESTS := $(RPASS_RC ) $(RPASS_RS )
514
+ RPASS_FULL_TESTS := $(RPASS_FULL_RC ) $(RPASS_FULL_RS )
515
+ CFAIL_FULL_TESTS := $(CFAIL_FULL_RC ) $(CFAIL_FULL_RS )
516
+ RFAIL_TESTS := $(RFAIL_RC ) $(RFAIL_RS )
517
+ CFAIL_TESTS := $(CFAIL_RC ) $(CFAIL_RS )
517
518
BENCH_TESTS := $(BENCH_RS )
518
519
PERF_TESTS := $(PERF_RS )
519
520
PRETTY_TESTS := $(PRETTY_RS )
@@ -526,11 +527,6 @@ CTEST_BUILD_BASE_rpass = run-pass
526
527
CTEST_MODE_rpass = run-pass
527
528
CTEST_RUNTOOL_rpass = $(CTEST_RUNTOOL )
528
529
529
- CTEST_SRC_BASE_rpass-valgrind = run-pass-valgrind
530
- CTEST_BUILD_BASE_rpass-valgrind = run-pass-valgrind
531
- CTEST_MODE_rpass-valgrind = run-pass-valgrind
532
- CTEST_RUNTOOL_rpass-valgrind = $(CTEST_RUNTOOL )
533
-
534
530
CTEST_SRC_BASE_rpass-full = run-pass-fulldeps
535
531
CTEST_BUILD_BASE_rpass-full = run-pass-fulldeps
536
532
CTEST_MODE_rpass-full = run-pass
@@ -626,7 +622,7 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
626
622
# remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
627
623
CTEST_RUSTC_FLAGS := $$(subst --cfg ndebug,,$$(CFG_RUSTC_FLAGS ) )
628
624
629
- # The tests cannot be optimized while the rest of the compiler is optimized, so
625
+ # The tests can not be optimized while the rest of the compiler is optimized, so
630
626
# filter out the optimization (if any) from rustc and then figure out if we need
631
627
# to be optimized
632
628
CTEST_RUSTC_FLAGS := $$(subst -O,,$$(CTEST_RUSTC_FLAGS ) )
@@ -638,7 +634,6 @@ endif
638
634
# slow things down.
639
635
CTEST_RUSTC_FLAGS += -C codegen-units=1
640
636
641
-
642
637
CTEST_COMMON_ARGS$(1 ) -T-$(2 ) -H-$(3 ) := \
643
638
--compile-lib-path $$(HLIB$(1 ) _H_$(3 ) ) \
644
639
--run-lib-path $$(TLIB$(1 ) _T_$(2 ) _H_$(3 ) ) \
@@ -659,21 +654,7 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
659
654
--target-rustcflags "$(RUSTC_FLAGS_$(2 ) ) $$(CTEST_RUSTC_FLAGS ) -L $$(RT_OUTPUT_DIR_$(2 ) ) " \
660
655
$$(CTEST_TESTARGS )
661
656
662
- ifdef CFG_VALGRIND_RPASS
663
- ifdef GOOD_VALGRIND_$(2)
664
- $(info cfg : valgrind-path set to $(CFG_VALGRIND_RPASS ) )
665
- CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) += --valgrind-path "$(CFG_VALGRIND_RPASS ) "
666
- endif
667
- endif
668
-
669
- ifndef CFG_DISABLE_VALGRIND_RPASS
670
- ifdef GOOD_VALGRIND_$(2)
671
- CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) += --force-valgrind
672
- endif
673
- endif
674
-
675
657
CTEST_DEPS_rpass_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_TESTS )
676
- CTEST_DEPS_rpass-valgrind_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_VALGRIND_TESTS )
677
658
CTEST_DEPS_rpass-full_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RPASS_FULL_TESTS ) $$(CSREQ$(1 ) _T_$(3 ) _H_$(3 ) ) $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
678
659
CTEST_DEPS_cfail-full_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CFAIL_FULL_TESTS ) $$(CSREQ$(1 ) _T_$(3 ) _H_$(3 ) ) $$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
679
660
CTEST_DEPS_rfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(RFAIL_TESTS )
@@ -745,17 +726,16 @@ endif
745
726
746
727
endef
747
728
748
- CTEST_NAMES = rpass rpass-valgrind rpass- full cfail-full rfail cfail bench perf debuginfo-gdb debuginfo-lldb codegen
729
+ CTEST_NAMES = rpass rpass-full cfail-full rfail cfail bench perf debuginfo-gdb debuginfo-lldb codegen
749
730
750
731
$(foreach host,$(CFG_HOST), \
751
732
$(eval $(foreach target,$(CFG_TARGET), \
752
733
$(eval $(foreach stage,$(STAGES), \
753
734
$(eval $(foreach name,$(CTEST_NAMES), \
754
735
$(eval $(call DEF_RUN_COMPILETEST,$(stage),$(target),$(host),$(name))))))))))
755
736
756
- PRETTY_NAMES = pretty-rpass pretty-rpass-valgrind pretty-rpass- full pretty-rfail pretty-bench pretty-pretty
737
+ PRETTY_NAMES = pretty-rpass pretty-rpass-full pretty-rfail pretty-bench pretty-pretty
757
738
PRETTY_DEPS_pretty-rpass = $(RPASS_TESTS )
758
- PRETTY_DEPS_pretty-rpass-valgrind = $(RPASS_VALGRIND_TESTS )
759
739
PRETTY_DEPS_pretty-rpass-full = $(RPASS_FULL_TESTS )
760
740
PRETTY_DEPS_pretty-rfail = $(RFAIL_TESTS )
761
741
PRETTY_DEPS_pretty-bench = $(BENCH_TESTS )
@@ -768,7 +748,6 @@ PRETTY_DEPS$(1)_H_$(3)_pretty-rfail =
768
748
PRETTY_DEPS$(1)_H_$(3)_pretty-bench =
769
749
PRETTY_DEPS$(1)_H_$(3)_pretty-pretty =
770
750
PRETTY_DIRNAME_pretty-rpass = run-pass
771
- PRETTY_DIRNAME_pretty-rpass-valgrind = run-pass-valgrind
772
751
PRETTY_DIRNAME_pretty-rpass-full = run-pass-fulldeps
773
752
PRETTY_DIRNAME_pretty-rfail = run-fail
774
753
PRETTY_DIRNAME_pretty-bench = bench
@@ -916,7 +895,6 @@ TEST_GROUPS = \
916
895
$(foreach crate,$(TEST_CRATES ) ,$(crate ) ) \
917
896
$(foreach crate,$(TEST_DOC_CRATES ) ,doc-crate-$(crate ) ) \
918
897
rpass \
919
- rpass-valgrind \
920
898
rpass-full \
921
899
cfail-full \
922
900
rfail \
@@ -931,7 +909,6 @@ TEST_GROUPS = \
931
909
$(foreach docname,$(DOCS ) ,doc-$(docname ) ) \
932
910
pretty \
933
911
pretty-rpass \
934
- pretty-rpass-valgrind \
935
912
pretty-rpass-full \
936
913
pretty-rfail \
937
914
pretty-bench \
0 commit comments