Skip to content

Commit e8e6b26

Browse files
brsongraydon
authored andcommitted
---
yaml --- r: 1627 b: refs/heads/master c: 97245ed h: refs/heads/master i: 1625: 4e33a6c 1623: 58d26af v: v3
1 parent 830bfab commit e8e6b26

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 8438eca45cf20b4949450aaf2a3bd5212877d337
2+
refs/heads/master: 97245edd8009bc470a3d989dcd100e247a6ab4d6

trunk/src/Makefile

+11-5
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
575575
wrong-ret-type.rs \
576576
), \
577577
$(wildcard test/*fail/*.rs test/*fail/*.rc)) \
578-
test/bench/shootout/fasta.rs
579-
578+
test/bench/shootout/fasta.rs \
579+
$(wildcard test/bench/99-bottles/*rs)
580580

581581
ifdef MINGW_CROSS
582582
TEST_XFAILS_BOOT += test/run-pass/native-mod.rc
@@ -587,9 +587,9 @@ TEST_XFAILS_BOOT += test/run-pass/native-mod.rc
587587
TEST_XFAILS_RUSTC += test/run-pass/native-mod.rc
588588
endif
589589

590-
BENCH_RC := $(wildcard test/bench/shootout/*rc)
591-
BENCH_RS := $(wildcard test/bench/shootout/*rs)
592-
RPASS_RC := $(wildcard test/run-pass/*.rc) $(BENCH_RC)
590+
BENCH_RS := $(wildcard test/bench/shootout/*rs) \
591+
$(wildcard test/bench/99-bottles/*rs)
592+
RPASS_RC := $(wildcard test/run-pass/*.rc)
593593
RPASS_RS := $(wildcard test/run-pass/*.rs) $(BENCH_RS)
594594
RFAIL_RC := $(wildcard test/run-fail/*.rc)
595595
RFAIL_RS := $(wildcard test/run-fail/*.rs)
@@ -740,6 +740,12 @@ test/bench/shootout/%.out.tmp: test/bench/shootout/%$(CFG_EXE_SUFFIX) \
740740
@$(call CFG_ECHO, run: $<)
741741
$(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@
742742

743+
test/bench/99-bottles/%.out.tmp: test/bench/99-bottles/%$(CFG_EXE_SUFFIX) \
744+
$(CFG_RUNTIME)
745+
$(CFG_QUIET)rm -f $<.tmp
746+
@$(call CFG_ECHO, run: $<)
747+
$(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@
748+
743749
test/run-fail/%.out.tmp: test/run-fail/%$(CFG_EXE_SUFFIX) \
744750
$(CFG_RUNTIME)
745751
$(CFG_QUIET)rm -f $<.tmp

0 commit comments

Comments
 (0)