diff options
| author | Corey Richardson <corey@octayn.net> | 2013-08-12 14:15:05 -0400 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2013-08-28 08:16:21 -0400 |
| commit | 43f851d2cb3976655078f032dc1a8cb88f1c8deb (patch) | |
| tree | c8183618e16d0225893bb0f2d8e5f89f6b464fd1 | |
| parent | 8a07f5708196dd72ec030018c2a215a4dd823b2e (diff) | |
| download | rust-43f851d2cb3976655078f032dc1a8cb88f1c8deb.tar.gz rust-43f851d2cb3976655078f032dc1a8cb88f1c8deb.zip | |
Teach the makefile to use multiple src-base's
| -rw-r--r-- | mk/tests.mk | 5 | ||||
| -rw-r--r-- | src/compiletest/compiletest.rs | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/tests.mk b/mk/tests.mk index 00670d2f9c1..37ce99f4e6e 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -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 +CTEST_SRC_BASE_bench = bench bench/rt bench/shootout bench/std CTEST_BUILD_BASE_bench = bench CTEST_MODE_bench = run-pass CTEST_RUNTOOL_bench = $(CTEST_RUNTOOL) @@ -610,7 +610,8 @@ define DEF_RUN_COMPILETEST CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \ $$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \ - --src-base $$(S)src/test/$$(CTEST_SRC_BASE_$(4))/ \ + $(foreach base,$$(CTEST_SRC_BASE_$(4)), \ + --src-base $$(S)src/test/$$(base))/ \ --build-base $(3)/test/$$(CTEST_BUILD_BASE_$(4))/ \ --ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \ --mode $$(CTEST_MODE_$(4)) \ diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index ab76fca865f..a186714fd70 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -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 { |