From 938b23e228f4fd313973190f8f78163476cc4a3f Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Wed, 16 Nov 2011 10:35:51 -0800 Subject: [PATCH] fix prereqs --- mk/tests.mk | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/mk/tests.mk b/mk/tests.mk index 1447715629d..8316f0f12b9 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -233,56 +233,56 @@ PRETTY_PRETTY_ARGS$(1)-$(2) := $$(CTEST_COMMON_ARGS$(1)-$(2)) \ --mode pretty check-stage$(1)-$(2)-cfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(CFAIL_TESTS) + $$(SREQ$(1)$(2)) \ + $$(CFAIL_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(CFAIL_ARGS$(1)-$(2)) check-stage$(1)-$(2)-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(RFAIL_TESTS) + $$(SREQ$(1)$(2)) \ + $$(RFAIL_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RFAIL_ARGS$(1)-$(2)) check-stage$(1)-$(2)-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(RPASS_TESTS) + $$(SREQ$(1)$(2)) \ + $$(RPASS_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(RPASS_ARGS$(1)-$(2)) check-stage$(1)-$(2)-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(BENCH_TESTS) + $$(SREQ$(1)$(2)) \ + $$(BENCH_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(BENCH_ARGS$(1)-$(2)) check-stage$(1)-$(2)-perf-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(BENCH_TESTS) + $$(SREQ$(1)$(2)) \ + $$(BENCH_TESTS) @$$(call E, perf: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PERF_ARGS$(1)-$(2)) check-stage$(1)-$(2)-pretty-rpass-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(RPASS_TESTS) + $$(SREQ$(1)$(2)) \ + $$(RPASS_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RPASS_ARGS$(1)-$(2)) check-stage$(1)-$(2)-pretty-rfail-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(RFAIL_TESTS) + $$(SREQ$(1)$(2)) \ + $$(RFAIL_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_RFAIL_ARGS$(1)-$(2)) check-stage$(1)-$(2)-pretty-bench-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(BENCH_TESTS) + $$(SREQ$(1)$(2)) \ + $$(BENCH_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_BENCH_ARGS$(1)-$(2)) check-stage$(1)-$(2)-pretty-pretty-dummy: $$(HOST_BIN$(1))/compiletest$$(X) \ - $$(SREQ$(1)$$(CFG_HOST_TRIPLE)) \ - $$(PRETTY_TESTS) + $$(SREQ$(1)$(2)) \ + $$(PRETTY_TESTS) @$$(call E, run: $$<) $$(Q)$$(call CFG_RUN_CTEST,$(1),$$<) $$(PRETTY_PRETTY_ARGS$(1)-$(2))