Revert "Teach the makefile to use multiple src-base's"

This reverts commit 43f851d2cb.
This commit is contained in:
Corey Richardson 2013-08-30 16:17:29 -04:00
parent 43f851d2cb
commit fdcc415957
2 changed files with 3 additions and 4 deletions

View File

@ -516,7 +516,7 @@ CTEST_BUILD_BASE_cfail = compile-fail
CTEST_MODE_cfail = compile-fail
CTEST_RUNTOOL_cfail = $(CTEST_RUNTOOL)
CTEST_SRC_BASE_bench = bench bench/rt bench/shootout bench/std
CTEST_SRC_BASE_bench = bench
CTEST_BUILD_BASE_bench = bench
CTEST_MODE_bench = run-pass
CTEST_RUNTOOL_bench = $(CTEST_RUNTOOL)
@ -610,8 +610,7 @@ define DEF_RUN_COMPILETEST
CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \
$$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \
$(foreach base,$$(CTEST_SRC_BASE_$(4)), \
--src-base $$(S)src/test/$$(base))/ \
--src-base $$(S)src/test/$$(CTEST_SRC_BASE_$(4))/ \
--build-base $(3)/test/$$(CTEST_BUILD_BASE_$(4))/ \
--ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
--mode $$(CTEST_MODE_$(4)) \

View File

@ -105,7 +105,7 @@ pub fn parse_config(args: ~[~str]) -> config {
fn opt_path(m: &getopts::Matches, nm: &str) -> Path {
Path(getopts::opt_str(m, nm))
}
let src_base = getopts::opt_strs(matches, "src-base");
config {