Skip to content

Commit a38ba01

Browse files
committed
Move stdtest output files up a directory. Issue #428
1 parent ed556ab commit a38ba01

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

configure

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,7 @@ for i in \
182182
dl stage0 stage1 stage2 stage3 \
183183
stage0/lib stage1/lib stage2/lib stage3/lib \
184184
test/run-pass test/run-fail test/compile-fail \
185-
test/bench/99-bottles test/bench/shootout \
186-
test/stdtest
185+
test/bench/99-bottles test/bench/shootout
187186
do
188187
make_dir $i
189188
done

mk/tests.mk

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,26 +342,27 @@ test/compile-fail/%.stage2.out.tmp: test/compile-fail/%.rc $(SREQ2)
342342
STDTEST_CRATE := $(S)src/test/stdtest/stdtest.rc
343343
STDTEST_INPUTS := $(wildcard $(S)src/test/stdtest/*rs)
344344

345-
test/stdtest/stdtest.stage1$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ1)
345+
test/stdtest.stage1$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ1)
346346
@$(call E, compile_and_link: $@)
347347
$(STAGE1) -o $@ $< --test
348348

349-
test/stdtest/stdtest.stage2$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ2)
349+
test/stdtest.stage2$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ2)
350350
@$(call E, compile_and_link: $@)
351351
$(STAGE2) -o $@ $< --test
352352

353-
test/stdtest/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3)
353+
test/stdtest.stage3$(X): $(STDTEST_CRATE) $(STDTEST_INPUTS) $(SREQ3)
354354
@$(call E, compile_and_link: $@)
355355
$(STAGE3) -o $@ $< --test
356356

357-
check-stage1-std:test/stdtest/stdtest.stage1$(X)
357+
check-stage1-std:test/stdtest.stage1$(X)
358358
@$(call E, run: $<)
359359
$(Q)$(call CFG_RUN_TARG,stage1,stage1, $<)
360360

361-
check-stage2-std:test/stdtest/stdtest.stage2$(X)
361+
check-stage2-std:test/stdtest.stage2$(X)
362362
@$(call E, run: $<)
363363
$(Q)$(call CFG_RUN_TARG,stage2,stage2, $<)
364364

365-
check-stage3-std:test/stdtest/stdtest.stage3$(X)
365+
check-stage3-std:test/stdtest.stage3$(X)
366366
@$(call E, run: $<)
367367
$(Q)$(call CFG_RUN_TARG,stage3,stage3, $<)
368+

0 commit comments

Comments
 (0)