提交 a38ba01f 编写于 作者: B Brian Anderson

Move stdtest output files up a directory. Issue #428

上级 ed556ab0
......@@ -182,8 +182,7 @@ for i in \
dl stage0 stage1 stage2 stage3 \
stage0/lib stage1/lib stage2/lib stage3/lib \
test/run-pass test/run-fail test/compile-fail \
test/bench/99-bottles test/bench/shootout \
test/stdtest
test/bench/99-bottles test/bench/shootout
do
make_dir $i
done
......
......@@ -342,26 +342,27 @@ test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rc $(SREQ2)
STDTEST_CRATE := $(S)src/test/stdtest/stdtest.rc
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: $@)
$(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: $@)
$(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: $@)
$(STAGE3) -o $@ $< --test
check-stage1-std:test/stdtest/stdtest.stage1$(X)
check-stage1-std:test/stdtest.stage1$(X)
@$(call E, run: $<)
$(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: $<)
$(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: $<)
$(Q)$(call CFG_RUN_TARG,stage3,stage3, $<)
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册