From ea2a9681460c112e968a54f0d3378a0fab40e7b1 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 2 Aug 2011 14:37:03 -0700
Subject: [PATCH] Include benchmarks in pretty-print tests

---
 mk/tests.mk                              | 14 ++++++++++++++
 src/test/bench/shootout-binarytrees.rs   |  1 +
 src/test/bench/shootout-fannkuchredux.rs |  2 +-
 src/test/bench/shootout-fibo.rs          |  2 +-
 src/test/bench/shootout-nbody.rs         |  1 +
 src/test/bench/shootout-pfib.rs          |  1 +
 src/test/bench/task-perf-word-count.rs   |  1 +
 7 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/mk/tests.mk b/mk/tests.mk
index 228b480e6b6..10a0e14b43b 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -164,10 +164,13 @@ check-stage$(2)-pretty-rpass: test/pretty-rpass.stage$(2).out \
 
 check-stage$(2)-pretty-rfail: test/pretty-rfail.stage$(2).out \
 
+check-stage$(2)-pretty-bench: test/pretty-bench.stage$(2).out \
+
 check-stage$(2)-pretty-pretty: test/pretty-pretty.stage$(2).out \
 
 check-stage$(2)-pretty: check-stage$(2)-pretty-rpass \
                         check-stage$(2)-pretty-rfail \
+                        check-stage$(2)-pretty-bench \
                         check-stage$(2)-pretty-pretty \
 
 CTEST_COMMON_ARGS$(2) := --compile-lib-path stage$(2) \
@@ -210,6 +213,11 @@ PRETTY_RFAIL_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
                          --build-base test/run-fail/ \
                          --mode pretty \
 
+PRETTY_BENCH_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
+                         --src-base $$(S)src/test/bench/ \
+                         --build-base test/bench/ \
+                         --mode pretty \
+
 PRETTY_PRETTY_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
                           --src-base $$(S)src/test/pretty/ \
                           --build-base test/pretty/ \
@@ -257,6 +265,12 @@ test/pretty-rfail.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
 	$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(PRETTY_RFAIL_ARGS$(2))
 	$$(Q)touch $$@
 
+test/pretty-bench.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
+                                     $$(BENCH_TESTS)
+	@$$(call E, run: $$<)
+	$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(PRETTY_BENCH_ARGS$(2))
+	$$(Q)touch $$@
+
 test/pretty-pretty.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
                                      $$(PRETTY_TESTS)
 	@$$(call E, run: $$<)
diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs
index d7b5f527e7d..a85109cd9f1 100644
--- a/src/test/bench/shootout-binarytrees.rs
+++ b/src/test/bench/shootout-binarytrees.rs
@@ -1,3 +1,4 @@
+// xfail-pretty
 
 use std;
 import std::int;
diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs
index 6e1f12f258c..2a659ddfb9b 100644
--- a/src/test/bench/shootout-fannkuchredux.rs
+++ b/src/test/bench/shootout-fannkuchredux.rs
@@ -1,4 +1,4 @@
-
+// xfail-pretty
 
 // Based on Isaac Gouy's fannkuchredux.csharp
 use std;
diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout-fibo.rs
index 37590c0f9b3..28cf4d9b9c6 100644
--- a/src/test/bench/shootout-fibo.rs
+++ b/src/test/bench/shootout-fibo.rs
@@ -1,4 +1,4 @@
-
+// xfail-pretty
 
 
 // -*- rust -*-
diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout-nbody.rs
index 08ef4995ad4..fedab232e58 100644
--- a/src/test/bench/shootout-nbody.rs
+++ b/src/test/bench/shootout-nbody.rs
@@ -1,3 +1,4 @@
+// xfail-pretty
 // based on:
 // http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
 
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index bd320611f32..defb2b7be5b 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -1,3 +1,4 @@
+// xfail-pretty
 // -*- rust -*-
 
 /*
diff --git a/src/test/bench/task-perf-word-count.rs b/src/test/bench/task-perf-word-count.rs
index 0a6b94c7f2e..97fea953e3d 100644
--- a/src/test/bench/task-perf-word-count.rs
+++ b/src/test/bench/task-perf-word-count.rs
@@ -1,3 +1,4 @@
+// xfail-pretty
 /**
    A parallel word-frequency counting program.