OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust run rules to avoid early substitution. Testsuite begins to run.

This commit is contained in:
Graydon Hoare 2011-03-21 14:52:02 -07:00
parent 7941b41b6a
commit 0eb6be13fb
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.in
View File

@ -182,8 +182,6 @@ else
E = echo $(1) E = echo $(1)
endif endif
R := $(CFG_RUN_TARG)
T := $(CFG_RUN_TEST)
S := $(CFG_SRC_DIR) S := $(CFG_SRC_DIR)
X := $(CFG_EXE_SUFFIX) X := $(CFG_EXE_SUFFIX)
@ -192,8 +190,10 @@ VPATH := $(S)doc $(S)src
# Compilers we build, we now know how to run. # Compilers we build, we now know how to run.
BOOT := $(Q)OCAMLRUNPARAM="b1" boot/rustboot$(X) $(CFG_BOOT_FLAGS) -L boot BOOT := $(Q)OCAMLRUNPARAM="b1" boot/rustboot$(X) $(CFG_BOOT_FLAGS) -L boot
STAGE0 := $(Q)$(R) stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0 STAGE0 := $(Q)$(call CFG_RUN_TARG,\
STAGE1 := $(Q)$(R) stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1 stage0/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage0)
STAGE1 := $(Q)$(call CFG_RUN_TARG,\
stage1/rustc$(X) $(CFG_RUSTC_FLAGS) -L stage1)
# "Source" files we generate in builddir along the way. # "Source" files we generate in builddir along the way.
GENERATED := boot/fe/lexer.ml boot/version.ml GENERATED := boot/fe/lexer.ml boot/version.ml
@ -876,19 +876,19 @@ compile-check: tidy \
test/run-pass/%.out.tmp: test/run-pass/%$(X) rt/$(CFG_RUNTIME) test/run-pass/%.out.tmp: test/run-pass/%$(X) rt/$(CFG_RUNTIME)
$(Q)rm -f $<.tmp $(Q)rm -f $<.tmp
@$(call E, run: $@) @$(call E, run: $@)
$(Q)$(call T, $<) > $@ $(Q)$(call CFG_RUN_TEST, $<) > $@
test/bench/shootout/%.out.tmp: test/bench/shootout/%$(X) \ test/bench/shootout/%.out.tmp: test/bench/shootout/%$(X) \
rt/$(CFG_RUNTIME) rt/$(CFG_RUNTIME)
$(Q)rm -f $<.tmp $(Q)rm -f $<.tmp
@$(call E, run: $@) @$(call E, run: $@)
$(Q)$(call T, $<) > $@ $(Q)$(call CFG_RUN_TEST, $<) > $@
test/bench/99-bottles/%.out.tmp: test/bench/99-bottles/%$(X) \ test/bench/99-bottles/%.out.tmp: test/bench/99-bottles/%$(X) \
rt/$(CFG_RUNTIME) rt/$(CFG_RUNTIME)
$(Q)rm -f $<.tmp $(Q)rm -f $<.tmp
@$(call E, run: $@) @$(call E, run: $@)
$(Q)$(call T, $<) > $@ $(Q)$(call CFG_RUN_TEST, $<) > $@
test/run-fail/%.out.tmp: test/run-fail/%$(X) \ test/run-fail/%.out.tmp: test/run-fail/%$(X) \
rt/$(CFG_RUNTIME) rt/$(CFG_RUNTIME)
@ -896,7 +896,7 @@ test/run-fail/%.out.tmp: test/run-fail/%$(X) \
@$(call E, run: $@) @$(call E, run: $@)
$(Q)grep -q error-pattern $(S)src/test/run-fail/$(basename $*).rs $(Q)grep -q error-pattern $(S)src/test/run-fail/$(basename $*).rs
$(Q)rm -f $@ $(Q)rm -f $@
$(Q)$(call T, $<) >$@ 2>&1 ; X=$$? ; \ $(Q)$(call CFG_RUN_TEST, $<) >$@ 2>&1 ; X=$$? ; \
if [ $$X -eq 0 ] ; then exit 1 ; else exit 0 ; fi if [ $$X -eq 0 ] ; then exit 1 ; else exit 0 ; fi
$(Q)grep --text --quiet \ $(Q)grep --text --quiet \
"$$(grep error-pattern $(S)src/test/run-fail/$(basename $*).rs \ "$$(grep error-pattern $(S)src/test/run-fail/$(basename $*).rs \