From 97245edd8009bc470a3d989dcd100e247a6ab4d6 Mon Sep 17 00:00:00 2001
From: Brian Anderson <andersrb@gmail.com>
Date: Sun, 6 Mar 2011 20:11:57 -0500
Subject: [PATCH] Add 99-bottles benchmarks to testsuite

---
 src/Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index e2f2957cb59..3c94f1b3ea6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -575,8 +575,8 @@ TEST_XFAILS_RUSTC := $(addprefix test/run-pass/, \
                         wrong-ret-type.rs \
                         ), \
                       $(wildcard test/*fail/*.rs test/*fail/*.rc)) \
-                     test/bench/shootout/fasta.rs
-
+                     test/bench/shootout/fasta.rs \
+                     $(wildcard test/bench/99-bottles/*rs)
 
 ifdef MINGW_CROSS
 TEST_XFAILS_BOOT += test/run-pass/native-mod.rc
@@ -587,9 +587,9 @@ TEST_XFAILS_BOOT += test/run-pass/native-mod.rc
 TEST_XFAILS_RUSTC += test/run-pass/native-mod.rc
 endif
 
-BENCH_RC := $(wildcard test/bench/shootout/*rc)
-BENCH_RS := $(wildcard test/bench/shootout/*rs)
-RPASS_RC := $(wildcard test/run-pass/*.rc) $(BENCH_RC)
+BENCH_RS := $(wildcard test/bench/shootout/*rs) \
+            $(wildcard test/bench/99-bottles/*rs)
+RPASS_RC := $(wildcard test/run-pass/*.rc)
 RPASS_RS := $(wildcard test/run-pass/*.rs) $(BENCH_RS)
 RFAIL_RC := $(wildcard test/run-fail/*.rc)
 RFAIL_RS := $(wildcard test/run-fail/*.rs)
@@ -740,6 +740,12 @@ test/bench/shootout/%.out.tmp: test/bench/shootout/%$(CFG_EXE_SUFFIX) \
 	@$(call CFG_ECHO, run: $<)
 	$(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@
 
+test/bench/99-bottles/%.out.tmp: test/bench/99-bottles/%$(CFG_EXE_SUFFIX) \
+                                  $(CFG_RUNTIME)
+	$(CFG_QUIET)rm -f $<.tmp
+	@$(call CFG_ECHO, run: $<)
+	$(CFG_QUIET)$(call CFG_RUN_TARG, $<) > $@
+
 test/run-fail/%.out.tmp: test/run-fail/%$(CFG_EXE_SUFFIX) \
                                   $(CFG_RUNTIME)
 	$(CFG_QUIET)rm -f $<.tmp