Skip to content

Commit 06fc781

Browse files
committed
---
yaml --- r: 4350 b: refs/heads/master c: ea2a968 h: refs/heads/master v: v3
1 parent cf5ff3c commit 06fc781

File tree

8 files changed

+21
-3
lines changed

8 files changed

+21
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 795e80fc19dc1bd929fb1cf347c2e89b0e8059dc
2+
refs/heads/master: ea2a9681460c112e968a54f0d3378a0fab40e7b1

trunk/mk/tests.mk

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,13 @@ check-stage$(2)-pretty-rpass: test/pretty-rpass.stage$(2).out \
164164

165165
check-stage$(2)-pretty-rfail: test/pretty-rfail.stage$(2).out \
166166

167+
check-stage$(2)-pretty-bench: test/pretty-bench.stage$(2).out \
168+
167169
check-stage$(2)-pretty-pretty: test/pretty-pretty.stage$(2).out \
168170

169171
check-stage$(2)-pretty: check-stage$(2)-pretty-rpass \
170172
check-stage$(2)-pretty-rfail \
173+
check-stage$(2)-pretty-bench \
171174
check-stage$(2)-pretty-pretty \
172175

173176
CTEST_COMMON_ARGS$(2) := --compile-lib-path stage$(2) \
@@ -210,6 +213,11 @@ PRETTY_RFAIL_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
210213
--build-base test/run-fail/ \
211214
--mode pretty \
212215

216+
PRETTY_BENCH_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
217+
--src-base $$(S)src/test/bench/ \
218+
--build-base test/bench/ \
219+
--mode pretty \
220+
213221
PRETTY_PRETTY_ARGS$(2) := $$(CTEST_COMMON_ARGS$(2)) \
214222
--src-base $$(S)src/test/pretty/ \
215223
--build-base test/pretty/ \
@@ -257,6 +265,12 @@ test/pretty-rfail.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
257265
$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(PRETTY_RFAIL_ARGS$(2))
258266
$$(Q)touch $$@
259267

268+
test/pretty-bench.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
269+
$$(BENCH_TESTS)
270+
@$$(call E, run: $$<)
271+
$$(Q)$$(call CFG_RUN_CTEST,$(2),$$<) $$(PRETTY_BENCH_ARGS$(2))
272+
$$(Q)touch $$@
273+
260274
test/pretty-pretty.stage$(2).out.tmp: test/compiletest.stage$(2)$$(X) \
261275
$$(PRETTY_TESTS)
262276
@$$(call E, run: $$<)

trunk/src/test/bench/shootout-binarytrees.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-pretty
12

23
use std;
34
import std::int;

trunk/src/test/bench/shootout-fannkuchredux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
// xfail-pretty
22

33
// Based on Isaac Gouy's fannkuchredux.csharp
44
use std;

trunk/src/test/bench/shootout-fibo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
// xfail-pretty
22

33

44
// -*- rust -*-

trunk/src/test/bench/shootout-nbody.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-pretty
12
// based on:
23
// http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
34

trunk/src/test/bench/shootout-pfib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-pretty
12
// -*- rust -*-
23

34
/*

trunk/src/test/bench/task-perf-word-count.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// xfail-pretty
12
/**
23
A parallel word-frequency counting program.
34

0 commit comments

Comments
 (0)