Revert "src/test/bench: restructure"

This reverts commit 14cdc26.
rust-lang · Aug 30, 2013 · d7be86f · d7be86f · bors · Aug 30, 2013
1 parent f585767
commit d7be86f
Show file tree

Hide file tree

Showing 35 changed files with 2 additions and 2 deletions.
diff --git a/mk/tests.mk b/mk/tests.mk
@@ -476,15 +476,15 @@ 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)
 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)

diff --git a/src/test/bench/std/core-map.rs → src/test/bench/core-map.rs b/src/test/bench/std/core-map.rs → src/test/bench/core-map.rs
diff --git a/src/test/bench/std/core-set.rs → src/test/bench/core-set.rs b/src/test/bench/std/core-set.rs → src/test/bench/core-set.rs
diff --git a/src/test/bench/std/core-std.rs → src/test/bench/core-std.rs b/src/test/bench/std/core-std.rs → src/test/bench/core-std.rs
diff --git a/src/test/bench/std/core-uint-to-str.rs → src/test/bench/core-uint-to-str.rs b/src/test/bench/std/core-uint-to-str.rs → src/test/bench/core-uint-to-str.rs
diff --git a/src/test/bench/rt/msgsend-pipes-shared.rs → src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/rt/msgsend-pipes-shared.rs → src/test/bench/msgsend-pipes-shared.rs
diff --git a/src/test/bench/rt/msgsend-pipes.rs → src/test/bench/msgsend-pipes.rs b/src/test/bench/rt/msgsend-pipes.rs → src/test/bench/msgsend-pipes.rs
diff --git a/src/test/bench/rt/msgsend-ring-mutex-arcs.rs → src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/rt/msgsend-ring-mutex-arcs.rs → src/test/bench/msgsend-ring-mutex-arcs.rs
diff --git a/src/test/bench/rt/msgsend-ring-rw-arcs.rs → src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/rt/msgsend-ring-rw-arcs.rs → src/test/bench/msgsend-ring-rw-arcs.rs
diff --git a/src/test/bench/rt/rt-messaging-ping-pong.rs → src/test/bench/rt-messaging-ping-pong.rs b/src/test/bench/rt/rt-messaging-ping-pong.rs → src/test/bench/rt-messaging-ping-pong.rs
diff --git a/src/test/bench/rt/rt-parfib.rs → src/test/bench/rt-parfib.rs b/src/test/bench/rt/rt-parfib.rs → src/test/bench/rt-parfib.rs
diff --git a/src/test/bench/rt/rt-spawn-rate.rs → src/test/bench/rt-spawn-rate.rs b/src/test/bench/rt/rt-spawn-rate.rs → src/test/bench/rt-spawn-rate.rs
diff --git a/...test/bench/shootout/shootout-ackermann.rs → src/test/bench/shootout-ackermann.rs b/...test/bench/shootout/shootout-ackermann.rs → src/test/bench/shootout-ackermann.rs
diff --git a/...st/bench/shootout/shootout-binarytrees.rs → src/test/bench/shootout-binarytrees.rs b/...st/bench/shootout/shootout-binarytrees.rs → src/test/bench/shootout-binarytrees.rs
diff --git a/...ench/shootout/shootout-chameneos-redux.rs → src/test/bench/shootout-chameneos-redux.rs b/...ench/shootout/shootout-chameneos-redux.rs → src/test/bench/shootout-chameneos-redux.rs
diff --git a/...bench/shootout/shootout-fannkuch-redux.rs → src/test/bench/shootout-fannkuch-redux.rs b/...bench/shootout/shootout-fannkuch-redux.rs → src/test/bench/shootout-fannkuch-redux.rs
diff --git a/...st/bench/shootout/shootout-fasta-redux.rs → src/test/bench/shootout-fasta-redux.rs b/...st/bench/shootout/shootout-fasta-redux.rs → src/test/bench/shootout-fasta-redux.rs
diff --git a/src/test/bench/shootout/shootout-fasta.rs → src/test/bench/shootout-fasta.rs b/src/test/bench/shootout/shootout-fasta.rs → src/test/bench/shootout-fasta.rs
diff --git a/src/test/bench/shootout/shootout-fibo.rs → src/test/bench/shootout-fibo.rs b/src/test/bench/shootout/shootout-fibo.rs → src/test/bench/shootout-fibo.rs
diff --git a/...h/shootout/shootout-k-nucleotide-pipes.rs → ...test/bench/shootout-k-nucleotide-pipes.rs b/...h/shootout/shootout-k-nucleotide-pipes.rs → ...test/bench/shootout-k-nucleotide-pipes.rs
diff --git a/...bench/shootout/shootout-k-nucleotide.data → src/test/bench/shootout-k-nucleotide.data b/...bench/shootout/shootout-k-nucleotide.data → src/test/bench/shootout-k-nucleotide.data
diff --git a/...t/bench/shootout/shootout-k-nucleotide.rs → src/test/bench/shootout-k-nucleotide.rs b/...t/bench/shootout/shootout-k-nucleotide.rs → src/test/bench/shootout-k-nucleotide.rs
diff --git a/...est/bench/shootout/shootout-mandelbrot.rs → src/test/bench/shootout-mandelbrot.rs b/...est/bench/shootout/shootout-mandelbrot.rs → src/test/bench/shootout-mandelbrot.rs
diff --git a/src/test/bench/shootout/shootout-nbody.rs → src/test/bench/shootout-nbody.rs b/src/test/bench/shootout/shootout-nbody.rs → src/test/bench/shootout-nbody.rs
diff --git a/src/test/bench/shootout/shootout-pfib.rs → src/test/bench/shootout-pfib.rs b/src/test/bench/shootout/shootout-pfib.rs → src/test/bench/shootout-pfib.rs
diff --git a/src/test/bench/shootout/shootout-pidigits.rs → src/test/bench/shootout-pidigits.rs b/src/test/bench/shootout/shootout-pidigits.rs → src/test/bench/shootout-pidigits.rs
diff --git a/...h/shootout/shootout-reverse-complement.rs → ...test/bench/shootout-reverse-complement.rs b/...h/shootout/shootout-reverse-complement.rs → ...test/bench/shootout-reverse-complement.rs
diff --git a/...t/bench/shootout/shootout-spectralnorm.rs → src/test/bench/shootout-spectralnorm.rs b/...t/bench/shootout/shootout-spectralnorm.rs → src/test/bench/shootout-spectralnorm.rs
diff --git a/...est/bench/shootout/shootout-threadring.rs → src/test/bench/shootout-threadring.rs b/...est/bench/shootout/shootout-threadring.rs → src/test/bench/shootout-threadring.rs
diff --git a/src/test/bench/std/std-smallintmap.rs → src/test/bench/std-smallintmap.rs b/src/test/bench/std/std-smallintmap.rs → src/test/bench/std-smallintmap.rs
diff --git a/src/test/bench/rt/task-perf-alloc-unwind.rs → src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/rt/task-perf-alloc-unwind.rs → src/test/bench/task-perf-alloc-unwind.rs
diff --git a/.../bench/rt/task-perf-jargon-metal-smoke.rs → ...est/bench/task-perf-jargon-metal-smoke.rs b/.../bench/rt/task-perf-jargon-metal-smoke.rs → ...est/bench/task-perf-jargon-metal-smoke.rs
diff --git a/...test/bench/rt/task-perf-linked-failure.rs → src/test/bench/task-perf-linked-failure.rs b/...test/bench/rt/task-perf-linked-failure.rs → src/test/bench/task-perf-linked-failure.rs
diff --git a/src/test/bench/rt/task-perf-one-million.rs → src/test/bench/task-perf-one-million.rs b/src/test/bench/rt/task-perf-one-million.rs → src/test/bench/task-perf-one-million.rs
diff --git a/src/test/bench/rt/task-perf-spawnalot.rs → src/test/bench/task-perf-spawnalot.rs b/src/test/bench/rt/task-perf-spawnalot.rs → src/test/bench/task-perf-spawnalot.rs