Permalink
Browse files

Include benchmarks in pretty-print tests

  • Loading branch information...
1 parent 795e80f commit ea2a9681460c112e968a54f0d3378a0fab40e7b1 @brson brson committed Aug 2, 2011
View
@@ -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: $$<)
@@ -1,3 +1,4 @@
+// xfail-pretty
use std;
import std::int;
@@ -1,4 +1,4 @@
-
+// xfail-pretty
// Based on Isaac Gouy's fannkuchredux.csharp
use std;
@@ -1,4 +1,4 @@
-
+// xfail-pretty
// -*- rust -*-
@@ -1,3 +1,4 @@
+// xfail-pretty
// based on:
// http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
@@ -1,3 +1,4 @@
+// xfail-pretty
// -*- rust -*-
/*
@@ -1,3 +1,4 @@
+// xfail-pretty
/**
A parallel word-frequency counting program.

0 comments on commit ea2a968

Please sign in to comment.