diff options
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/src/Makefile b/src/Makefile index 43b66193..74359c00 100644 --- a/src/Makefile +++ b/src/Makefile @@ -255,6 +255,7 @@ RUNTIME_CS := rt/sync/timer.cpp \ rt/sync/lock_and_signal.cpp \ rt/rust.cpp \ rt/rust_builtin.cpp \ + rt/rust_run_program.cpp \ rt/rust_crate.cpp \ rt/rust_crate_cache.cpp \ rt/rust_crate_reader.cpp \ @@ -573,8 +574,11 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \ while-type-error.rs \ wrong-ret-type.rs \ ), \ - $(wildcard test/*fail/*.rs test/*fail/*.rc)) - + $(wildcard test/*fail/*.rs test/*fail/*.rc)) \ + test/bench/shootout/fannkuchredux.rs \ + test/bench/shootout/fasta.rs \ + test/bench/shootout/binarytrees.rs \ + $(wildcard test/bench/99-bottles/*rs) ifdef MINGW_CROSS TEST_XFAILS_BOOT += test/run-pass/native-mod.rc @@ -585,8 +589,10 @@ TEST_XFAILS_BOOT += test/run-pass/native-mod.rc TEST_XFAILS_RUSTC += test/run-pass/native-mod.rc endif +BENCH_RS := $(wildcard test/bench/shootout/*rs) \ + $(wildcard test/bench/99-bottles/*rs) RPASS_RC := $(wildcard test/run-pass/*.rc) -RPASS_RS := $(wildcard test/run-pass/*.rs) +RPASS_RS := $(wildcard test/run-pass/*.rs) $(BENCH_RS) RFAIL_RC := $(wildcard test/run-fail/*.rc) RFAIL_RS := $(wildcard test/run-fail/*.rs) CFAIL_RC := $(wildcard test/compile-fail/*.rc) @@ -730,6 +736,18 @@ test/run-pass/%.out.tmp: test/run-pass/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME) @$(call CFG_ECHO, run: $<) $(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@ +test/bench/shootout/%.out.tmp: test/bench/shootout/%$(CFG_EXE_SUFFIX) \ + $(CFG_RUNTIME) + $(CFG_QUIET)rm -f $<.tmp + @$(call CFG_ECHO, run: $<) + $(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@ + +test/bench/99-bottles/%.out.tmp: test/bench/99-bottles/%$(CFG_EXE_SUFFIX) \ + $(CFG_RUNTIME) + $(CFG_QUIET)rm -f $<.tmp + @$(call CFG_ECHO, run: $<) + $(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@ + test/run-fail/%.out.tmp: test/run-fail/%$(CFG_EXE_SUFFIX) \ $(CFG_RUNTIME) $(CFG_QUIET)rm -f $<.tmp @@ -758,14 +776,13 @@ test/compile-fail/%.rustc.out.tmp: test/compile-fail/%.rs $(SREQ) $(CFG_QUIET)grep --text --quiet \ "$$(grep error-pattern $< | cut -d : -f 2- | tr -d '\n\r')" $@ -test/run-pass/%.boot$(CFG_EXE_SUFFIX): test/run-pass/%.rc $(BREQ) - @$(call CFG_ECHO, compile [boot]: $<) - $(BOOT) -o $@ $< +%.bc: %.rc $(SREQ) + @$(call CFG_ECHO, compile [rustc]: $<) + $(RUSTC) -o $@ $< -test/bench/shootout/%.boot$(CFG_EXE_SUFFIX): \ - test/bench/shootout/%.rs $(BREQ) - @$(call CFG_ECHO, compile [boot]: $<) - $(BOOT) -o $@ $< +%.bc: %.rs $(SREQ) + @$(call CFG_ECHO, compile [rustc]: $<) + $(RUSTC) -o $@ $< %.ll: %.bc @$(call CFG_ECHO, dis [llvm]: $<) @@ -788,26 +805,14 @@ test/bench/shootout/%.boot$(CFG_EXE_SUFFIX): \ @# programs, I\'ll live with the noise. -$(CFG_QUIET)$(DSYMUTIL) $@ -test/run-pass/%.bc: test/run-pass/%.rc $(SREQ) - @$(call CFG_ECHO, compile [rustc]: $<) - $(RUSTC) -o $@ $< - -test/run-pass/%.boot$(CFG_EXE_SUFFIX): test/run-pass/%.rs $(BREQ) +%.boot$(CFG_EXE_SUFFIX): %.rs $(BREQ) @$(call CFG_ECHO, compile [boot]: $<) $(BOOT) -o $@ $< -test/run-pass/%.bc: test/run-pass/%.rs $(SREQ) - @$(call CFG_ECHO, compile [rustc]: $<) - $(RUSTC) -o $@ $< - -test/run-fail/%.boot$(CFG_EXE_SUFFIX): test/run-fail/%.rs $(BREQ) +%.boot$(CFG_EXE_SUFFIX): %.rc $(BREQ) @$(call CFG_ECHO, compile [boot]: $<) $(BOOT) -o $@ $< -test/run-fail/%.bc: test/run-fail/%.rs $(SREQ) - @$(call CFG_ECHO, compile [rustc]: $<) - $(RUSTC) -o $@ $< - ###################################################################### # Auto-dependency |