Revert "src/test/bench: restructure"

This reverts commit 14cdc26e8a.
2013-08-30 16:17:53 -04:00 · 2013-08-30 16:17:53 -04:00 · d7be86f1a5
parent f585767fba
commit d7be86f1a5
35 changed files with 2 additions and 2 deletions
--- a/mk/tests.mk
+++ b/mk/tests.mk
@ -476,7 +476,7 @@ RFAIL_RC := $(wildcard $(S)src/test/run-fail/*.rc)
 RFAIL_RS := $(wildcard $(S)src/test/run-fail/*.rs)
 CFAIL_RC := $(wildcard $(S)src/test/compile-fail/*.rc)
 CFAIL_RS := $(wildcard $(S)src/test/compile-fail/*.rs)
-BENCH_RS := $(wildcard $(S)src/test/bench/rt/*.rs $(S)src/test/bench/shootout/*.rs $(S)src/test/bench/std/*.rs $(S)src/test/bench/*.rs)
+BENCH_RS := $(wildcard $(S)src/test/bench/*.rs)
 PRETTY_RS := $(wildcard $(S)src/test/pretty/*.rs)
 DEBUGINFO_RS := $(wildcard $(S)src/test/debug-info/*.rs)
 CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
@ -484,7 +484,7 @@ CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)

 # perf tests are the same as bench tests only they run under
 # a performance monitor.
-PERF_RS := $(BENCH_RS)
+PERF_RS := $(wildcard $(S)src/test/bench/*.rs)

 RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
 RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
--- a/src/test/bench/std/core-map.rs
+++ b/src/test/bench/std/core-map.rs
--- a/src/test/bench/std/core-set.rs
+++ b/src/test/bench/std/core-set.rs
--- a/src/test/bench/std/core-std.rs
+++ b/src/test/bench/std/core-std.rs
--- a/src/test/bench/std/core-uint-to-str.rs
+++ b/src/test/bench/std/core-uint-to-str.rs
--- a/src/test/bench/rt/msgsend-pipes-shared.rs
+++ b/src/test/bench/rt/msgsend-pipes-shared.rs
--- a/src/test/bench/rt/msgsend-pipes.rs
+++ b/src/test/bench/rt/msgsend-pipes.rs
--- a/src/test/bench/rt/msgsend-ring-mutex-arcs.rs
+++ b/src/test/bench/rt/msgsend-ring-mutex-arcs.rs
--- a/src/test/bench/rt/msgsend-ring-rw-arcs.rs
+++ b/src/test/bench/rt/msgsend-ring-rw-arcs.rs
--- a/src/test/bench/rt/rt-messaging-ping-pong.rs
+++ b/src/test/bench/rt/rt-messaging-ping-pong.rs
--- a/src/test/bench/rt/rt-parfib.rs
+++ b/src/test/bench/rt/rt-parfib.rs
--- a/src/test/bench/rt/rt-spawn-rate.rs
+++ b/src/test/bench/rt/rt-spawn-rate.rs
--- a/src/test/bench/shootout/shootout-ackermann.rs
+++ b/src/test/bench/shootout/shootout-ackermann.rs
--- a/src/test/bench/shootout/shootout-binarytrees.rs
+++ b/src/test/bench/shootout/shootout-binarytrees.rs
--- a/src/test/bench/shootout/shootout-chameneos-redux.rs
+++ b/src/test/bench/shootout/shootout-chameneos-redux.rs
--- a/src/test/bench/shootout/shootout-fannkuch-redux.rs
+++ b/src/test/bench/shootout/shootout-fannkuch-redux.rs
--- a/src/test/bench/shootout/shootout-fasta-redux.rs
+++ b/src/test/bench/shootout/shootout-fasta-redux.rs
--- a/src/test/bench/shootout/shootout-fasta.rs
+++ b/src/test/bench/shootout/shootout-fasta.rs
--- a/src/test/bench/shootout/shootout-fibo.rs
+++ b/src/test/bench/shootout/shootout-fibo.rs
--- a/src/test/bench/shootout/shootout-k-nucleotide-pipes.rs
+++ b/src/test/bench/shootout/shootout-k-nucleotide-pipes.rs
--- a/src/test/bench/shootout/shootout-k-nucleotide.data
+++ b/src/test/bench/shootout/shootout-k-nucleotide.data
--- a/src/test/bench/shootout/shootout-k-nucleotide.rs
+++ b/src/test/bench/shootout/shootout-k-nucleotide.rs
--- a/src/test/bench/shootout/shootout-mandelbrot.rs
+++ b/src/test/bench/shootout/shootout-mandelbrot.rs
--- a/src/test/bench/shootout/shootout-nbody.rs
+++ b/src/test/bench/shootout/shootout-nbody.rs
--- a/src/test/bench/shootout/shootout-pfib.rs
+++ b/src/test/bench/shootout/shootout-pfib.rs
--- a/src/test/bench/shootout/shootout-pidigits.rs
+++ b/src/test/bench/shootout/shootout-pidigits.rs
--- a/src/test/bench/shootout/shootout-reverse-complement.rs
+++ b/src/test/bench/shootout/shootout-reverse-complement.rs
--- a/src/test/bench/shootout/shootout-spectralnorm.rs
+++ b/src/test/bench/shootout/shootout-spectralnorm.rs
--- a/src/test/bench/shootout/shootout-threadring.rs
+++ b/src/test/bench/shootout/shootout-threadring.rs
--- a/src/test/bench/std/std-smallintmap.rs
+++ b/src/test/bench/std/std-smallintmap.rs
--- a/src/test/bench/rt/task-perf-alloc-unwind.rs
+++ b/src/test/bench/rt/task-perf-alloc-unwind.rs
--- a/src/test/bench/rt/task-perf-jargon-metal-smoke.rs
+++ b/src/test/bench/rt/task-perf-jargon-metal-smoke.rs
--- a/src/test/bench/rt/task-perf-linked-failure.rs
+++ b/src/test/bench/rt/task-perf-linked-failure.rs
--- a/src/test/bench/rt/task-perf-one-million.rs
+++ b/src/test/bench/rt/task-perf-one-million.rs
--- a/src/test/bench/rt/task-perf-spawnalot.rs
+++ b/src/test/bench/rt/task-perf-spawnalot.rs