nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-08 16:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change make rules around running tests to not produce an .out file if test-run fails.

Browse Source
This commit is contained in:
Graydon Hoare 2010-07-02 12:54:01 -07:00
parent f522605f6b
commit 4ea41512fc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile
View File

@ -567,11 +567,17 @@ endif
REQ := $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB) REQ := $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB)
BOOT := $(CFG_QUIET)OCAMLRUNPARAM="b1" $(CFG_BOOT) $(CFG_BOOT_FLAGS) BOOT := $(CFG_QUIET)OCAMLRUNPARAM="b1" $(CFG_BOOT) $(CFG_BOOT_FLAGS)
test/run-pass/%.out: test/run-pass/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME) # Cancel the implicit .out rule in GNU make.
%.out: %
%.out: %.out.tmp
$(CFG_QUIET)mv $< $@
test/run-pass/%.out.tmp: test/run-pass/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME)
@$(call CFG_ECHO, run: $<) @$(call CFG_ECHO, run: $<)
$(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@ $(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@
test/run-fail/%.out: test/run-fail/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME) test/run-fail/%.out.tmp: test/run-fail/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME)
@$(call CFG_ECHO, run: $<) @$(call CFG_ECHO, run: $<)
$(CFG_QUIET)rm -f $@ $(CFG_QUIET)rm -f $@
$(CFG_QUIET)$(call CFG_RUN_TARG, $<) >$@ 2>&1 ; X=$$? ; \ $(CFG_QUIET)$(call CFG_RUN_TARG, $<) >$@ 2>&1 ; X=$$? ; \
@ -580,14 +586,14 @@ test/run-fail/%.out: test/run-fail/%$(CFG_EXE_SUFFIX) $(CFG_RUNTIME)
"`awk -F: '/error-pattern/ { print $$2 }' \ "`awk -F: '/error-pattern/ { print $$2 }' \
$(basename $(basename $@)).rs | tr -d '\n\r'`" $@ $(basename $(basename $@)).rs | tr -d '\n\r'`" $@
test/compile-fail/%.x86.out: test/compile-fail/%.rs $(REQ) test/compile-fail/%.x86.out.tmp: test/compile-fail/%.rs $(REQ)
@$(call CFG_ECHO, compile [x86]: $<) @$(call CFG_ECHO, compile [x86]: $<)
$(CFG_QUIET)rm -f $@ $(CFG_QUIET)rm -f $@
$(BOOT) -o $(@:.out=$(CFG_EXE_SUFFIX)) $< >$@ 2>&1 || true $(BOOT) -o $(@:.out=$(CFG_EXE_SUFFIX)) $< >$@ 2>&1 || true
$(CFG_QUIET)grep --text --quiet \ $(CFG_QUIET)grep --text --quiet \
"`awk -F: '/error-pattern/ { print $$2 }' $< | tr -d '\n\r'`" $@ "`awk -F: '/error-pattern/ { print $$2 }' $< | tr -d '\n\r'`" $@
test/compile-fail/%.llvm.out: test/compile-fail/%.rs $(REQ) test/compile-fail/%.llvm.out.tmp: test/compile-fail/%.rs $(REQ)
@$(call CFG_ECHO, compile [llvm]: $<) @$(call CFG_ECHO, compile [llvm]: $<)
$(CFG_QUIET)rm -f $@ $(CFG_QUIET)rm -f $@
$(BOOT) -o $(@:.out=$(CFG_EXE_SUFFIX)) $< >$@ 2>&1 || true $(BOOT) -o $(@:.out=$(CFG_EXE_SUFFIX)) $< >$@ 2>&1 || true