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

Move stdtest output files up a directory. Issue #428

This commit is contained in:
Brian Anderson 2011-07-12 14:59:13 -07:00
parent ed556ab094
commit a38ba01fa4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -182,8 +182,7 @@ for i in \
dl stage0 stage1 stage2 stage3 \ dl stage0 stage1 stage2 stage3 \
stage0/lib stage1/lib stage2/lib stage3/lib \ stage0/lib stage1/lib stage2/lib stage3/lib \
test/run-pass test/run-fail test/compile-fail \ test/run-pass test/run-fail test/compile-fail \
test/bench/99-bottles test/bench/shootout \ test/bench/99-bottles test/bench/shootout
test/stdtest
do do
make_dir $i make_dir $i
done done

13
mk/tests.mk
View File

@ -342,26 +342,27 @@ test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rc $(SREQ2)
STDTEST_CRATE := $(S)src/test/stdtest/stdtest.rc STDTEST_CRATE := $(S)src/test/stdtest/stdtest.rc
STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs) STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
test/stdtest/stdtest.stage1$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ1) test/stdtest.stage1$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ1)
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE1) -o $@ $< --test $(STAGE1) -o $@ $< --test
test/stdtest/stdtest.stage2$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ2) test/stdtest.stage2$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ2)
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE2) -o $@ $< --test $(STAGE2) -o $@ $< --test
test/stdtest/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3) test/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3)
@$(call E, compile_and_link: $@) @$(call E, compile_and_link: $@)
$(STAGE3) -o $@ $< --test $(STAGE3) -o $@ $< --test
check-stage1-std:test/stdtest/stdtest.stage1$(X) check-stage1-std:test/stdtest.stage1$(X)
@$(call E, run: $<) @$(call E, run: $<)
$(Q)$(call CFG_RUN_TARG,stage1,stage1, $<) $(Q)$(call CFG_RUN_TARG,stage1,stage1, $<)
check-stage2-std:test/stdtest/stdtest.stage2$(X) check-stage2-std:test/stdtest.stage2$(X)
@$(call E, run: $<) @$(call E, run: $<)
$(Q)$(call CFG_RUN_TARG,stage2,stage2, $<) $(Q)$(call CFG_RUN_TARG,stage2,stage2, $<)
check-stage3-std:test/stdtest/stdtest.stage3$(X) check-stage3-std:test/stdtest.stage3$(X)
@$(call E, run: $<) @$(call E, run: $<)
$(Q)$(call CFG_RUN_TARG,stage3,stage3, $<) $(Q)$(call CFG_RUN_TARG,stage3,stage3, $<)