Include benchmarks in pretty-print tests

rust-lang · Aug 2, 2011 · ea2a968 · ea2a968
1 parent 795e80f
commit ea2a968
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-
+// xfail-pretty
 
 
 // -*- rust -*-

diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+// xfail-pretty
 /**
    A parallel word-frequency counting program.