From 14cdc26e8a7794e437946f46df5769362b42acdf Mon Sep 17 00:00:00 2001
From: Corey Richardson <corey@octayn.net>
Date: Sun, 11 Aug 2013 17:37:36 -0400
Subject: [PATCH] src/test/bench: restructure

---
 mk/tests.mk                                                  | 4 ++--
 src/test/bench/{ => rt}/msgsend-pipes-shared.rs              | 0
 src/test/bench/{ => rt}/msgsend-pipes.rs                     | 0
 src/test/bench/{ => rt}/msgsend-ring-mutex-arcs.rs           | 0
 src/test/bench/{ => rt}/msgsend-ring-rw-arcs.rs              | 0
 src/test/bench/{ => rt}/rt-messaging-ping-pong.rs            | 0
 src/test/bench/{ => rt}/rt-parfib.rs                         | 0
 src/test/bench/{ => rt}/rt-spawn-rate.rs                     | 0
 src/test/bench/{ => rt}/task-perf-alloc-unwind.rs            | 0
 src/test/bench/{ => rt}/task-perf-jargon-metal-smoke.rs      | 0
 src/test/bench/{ => rt}/task-perf-linked-failure.rs          | 0
 src/test/bench/{ => rt}/task-perf-one-million.rs             | 0
 src/test/bench/{ => rt}/task-perf-spawnalot.rs               | 0
 src/test/bench/{ => shootout}/shootout-ackermann.rs          | 0
 src/test/bench/{ => shootout}/shootout-binarytrees.rs        | 0
 src/test/bench/{ => shootout}/shootout-chameneos-redux.rs    | 0
 src/test/bench/{ => shootout}/shootout-fannkuch-redux.rs     | 0
 src/test/bench/{ => shootout}/shootout-fasta-redux.rs        | 0
 src/test/bench/{ => shootout}/shootout-fasta.rs              | 0
 src/test/bench/{ => shootout}/shootout-fibo.rs               | 0
 src/test/bench/{ => shootout}/shootout-k-nucleotide-pipes.rs | 0
 src/test/bench/{ => shootout}/shootout-k-nucleotide.data     | 0
 src/test/bench/{ => shootout}/shootout-k-nucleotide.rs       | 0
 src/test/bench/{ => shootout}/shootout-mandelbrot.rs         | 0
 src/test/bench/{ => shootout}/shootout-nbody.rs              | 0
 src/test/bench/{ => shootout}/shootout-pfib.rs               | 0
 src/test/bench/{ => shootout}/shootout-pidigits.rs           | 0
 src/test/bench/{ => shootout}/shootout-reverse-complement.rs | 0
 src/test/bench/{ => shootout}/shootout-spectralnorm.rs       | 0
 src/test/bench/{ => shootout}/shootout-threadring.rs         | 0
 src/test/bench/{ => std}/core-map.rs                         | 0
 src/test/bench/{ => std}/core-set.rs                         | 0
 src/test/bench/{ => std}/core-std.rs                         | 0
 src/test/bench/{ => std}/core-uint-to-str.rs                 | 0
 src/test/bench/{ => std}/std-smallintmap.rs                  | 0
 35 files changed, 2 insertions(+), 2 deletions(-)
 rename src/test/bench/{ => rt}/msgsend-pipes-shared.rs (100%)
 rename src/test/bench/{ => rt}/msgsend-pipes.rs (100%)
 rename src/test/bench/{ => rt}/msgsend-ring-mutex-arcs.rs (100%)
 rename src/test/bench/{ => rt}/msgsend-ring-rw-arcs.rs (100%)
 rename src/test/bench/{ => rt}/rt-messaging-ping-pong.rs (100%)
 rename src/test/bench/{ => rt}/rt-parfib.rs (100%)
 rename src/test/bench/{ => rt}/rt-spawn-rate.rs (100%)
 rename src/test/bench/{ => rt}/task-perf-alloc-unwind.rs (100%)
 rename src/test/bench/{ => rt}/task-perf-jargon-metal-smoke.rs (100%)
 rename src/test/bench/{ => rt}/task-perf-linked-failure.rs (100%)
 rename src/test/bench/{ => rt}/task-perf-one-million.rs (100%)
 rename src/test/bench/{ => rt}/task-perf-spawnalot.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-ackermann.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-binarytrees.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-chameneos-redux.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-fannkuch-redux.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-fasta-redux.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-fasta.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-fibo.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-k-nucleotide-pipes.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-k-nucleotide.data (100%)
 rename src/test/bench/{ => shootout}/shootout-k-nucleotide.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-mandelbrot.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-nbody.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-pfib.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-pidigits.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-reverse-complement.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-spectralnorm.rs (100%)
 rename src/test/bench/{ => shootout}/shootout-threadring.rs (100%)
 rename src/test/bench/{ => std}/core-map.rs (100%)
 rename src/test/bench/{ => std}/core-set.rs (100%)
 rename src/test/bench/{ => std}/core-std.rs (100%)
 rename src/test/bench/{ => std}/core-uint-to-str.rs (100%)
 rename src/test/bench/{ => std}/std-smallintmap.rs (100%)

diff --git a/mk/tests.mk b/mk/tests.mk
index 67b2a26c3af..00670d2f9c1 100644
--- 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/*.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)
 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 := $(wildcard $(S)src/test/bench/*.rs)
+PERF_RS := $(BENCH_RS)
 
 RPASS_TESTS := $(RPASS_RC) $(RPASS_RS)
 RPASS_FULL_TESTS := $(RPASS_FULL_RC) $(RPASS_FULL_RS)
diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/rt/msgsend-pipes-shared.rs
similarity index 100%
rename from src/test/bench/msgsend-pipes-shared.rs
rename to src/test/bench/rt/msgsend-pipes-shared.rs
diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/rt/msgsend-pipes.rs
similarity index 100%
rename from src/test/bench/msgsend-pipes.rs
rename to src/test/bench/rt/msgsend-pipes.rs
diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/rt/msgsend-ring-mutex-arcs.rs
similarity index 100%
rename from src/test/bench/msgsend-ring-mutex-arcs.rs
rename to src/test/bench/rt/msgsend-ring-mutex-arcs.rs
diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/rt/msgsend-ring-rw-arcs.rs
similarity index 100%
rename from src/test/bench/msgsend-ring-rw-arcs.rs
rename to src/test/bench/rt/msgsend-ring-rw-arcs.rs
diff --git a/src/test/bench/rt-messaging-ping-pong.rs b/src/test/bench/rt/rt-messaging-ping-pong.rs
similarity index 100%
rename from src/test/bench/rt-messaging-ping-pong.rs
rename to src/test/bench/rt/rt-messaging-ping-pong.rs
diff --git a/src/test/bench/rt-parfib.rs b/src/test/bench/rt/rt-parfib.rs
similarity index 100%
rename from src/test/bench/rt-parfib.rs
rename to src/test/bench/rt/rt-parfib.rs
diff --git a/src/test/bench/rt-spawn-rate.rs b/src/test/bench/rt/rt-spawn-rate.rs
similarity index 100%
rename from src/test/bench/rt-spawn-rate.rs
rename to src/test/bench/rt/rt-spawn-rate.rs
diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/rt/task-perf-alloc-unwind.rs
similarity index 100%
rename from src/test/bench/task-perf-alloc-unwind.rs
rename to src/test/bench/rt/task-perf-alloc-unwind.rs
diff --git a/src/test/bench/task-perf-jargon-metal-smoke.rs b/src/test/bench/rt/task-perf-jargon-metal-smoke.rs
similarity index 100%
rename from src/test/bench/task-perf-jargon-metal-smoke.rs
rename to src/test/bench/rt/task-perf-jargon-metal-smoke.rs
diff --git a/src/test/bench/task-perf-linked-failure.rs b/src/test/bench/rt/task-perf-linked-failure.rs
similarity index 100%
rename from src/test/bench/task-perf-linked-failure.rs
rename to src/test/bench/rt/task-perf-linked-failure.rs
diff --git a/src/test/bench/task-perf-one-million.rs b/src/test/bench/rt/task-perf-one-million.rs
similarity index 100%
rename from src/test/bench/task-perf-one-million.rs
rename to src/test/bench/rt/task-perf-one-million.rs
diff --git a/src/test/bench/task-perf-spawnalot.rs b/src/test/bench/rt/task-perf-spawnalot.rs
similarity index 100%
rename from src/test/bench/task-perf-spawnalot.rs
rename to src/test/bench/rt/task-perf-spawnalot.rs
diff --git a/src/test/bench/shootout-ackermann.rs b/src/test/bench/shootout/shootout-ackermann.rs
similarity index 100%
rename from src/test/bench/shootout-ackermann.rs
rename to src/test/bench/shootout/shootout-ackermann.rs
diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout/shootout-binarytrees.rs
similarity index 100%
rename from src/test/bench/shootout-binarytrees.rs
rename to src/test/bench/shootout/shootout-binarytrees.rs
diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout/shootout-chameneos-redux.rs
similarity index 100%
rename from src/test/bench/shootout-chameneos-redux.rs
rename to src/test/bench/shootout/shootout-chameneos-redux.rs
diff --git a/src/test/bench/shootout-fannkuch-redux.rs b/src/test/bench/shootout/shootout-fannkuch-redux.rs
similarity index 100%
rename from src/test/bench/shootout-fannkuch-redux.rs
rename to src/test/bench/shootout/shootout-fannkuch-redux.rs
diff --git a/src/test/bench/shootout-fasta-redux.rs b/src/test/bench/shootout/shootout-fasta-redux.rs
similarity index 100%
rename from src/test/bench/shootout-fasta-redux.rs
rename to src/test/bench/shootout/shootout-fasta-redux.rs
diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout/shootout-fasta.rs
similarity index 100%
rename from src/test/bench/shootout-fasta.rs
rename to src/test/bench/shootout/shootout-fasta.rs
diff --git a/src/test/bench/shootout-fibo.rs b/src/test/bench/shootout/shootout-fibo.rs
similarity index 100%
rename from src/test/bench/shootout-fibo.rs
rename to src/test/bench/shootout/shootout-fibo.rs
diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout/shootout-k-nucleotide-pipes.rs
similarity index 100%
rename from src/test/bench/shootout-k-nucleotide-pipes.rs
rename to src/test/bench/shootout/shootout-k-nucleotide-pipes.rs
diff --git a/src/test/bench/shootout-k-nucleotide.data b/src/test/bench/shootout/shootout-k-nucleotide.data
similarity index 100%
rename from src/test/bench/shootout-k-nucleotide.data
rename to src/test/bench/shootout/shootout-k-nucleotide.data
diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout/shootout-k-nucleotide.rs
similarity index 100%
rename from src/test/bench/shootout-k-nucleotide.rs
rename to src/test/bench/shootout/shootout-k-nucleotide.rs
diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout/shootout-mandelbrot.rs
similarity index 100%
rename from src/test/bench/shootout-mandelbrot.rs
rename to src/test/bench/shootout/shootout-mandelbrot.rs
diff --git a/src/test/bench/shootout-nbody.rs b/src/test/bench/shootout/shootout-nbody.rs
similarity index 100%
rename from src/test/bench/shootout-nbody.rs
rename to src/test/bench/shootout/shootout-nbody.rs
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout/shootout-pfib.rs
similarity index 100%
rename from src/test/bench/shootout-pfib.rs
rename to src/test/bench/shootout/shootout-pfib.rs
diff --git a/src/test/bench/shootout-pidigits.rs b/src/test/bench/shootout/shootout-pidigits.rs
similarity index 100%
rename from src/test/bench/shootout-pidigits.rs
rename to src/test/bench/shootout/shootout-pidigits.rs
diff --git a/src/test/bench/shootout-reverse-complement.rs b/src/test/bench/shootout/shootout-reverse-complement.rs
similarity index 100%
rename from src/test/bench/shootout-reverse-complement.rs
rename to src/test/bench/shootout/shootout-reverse-complement.rs
diff --git a/src/test/bench/shootout-spectralnorm.rs b/src/test/bench/shootout/shootout-spectralnorm.rs
similarity index 100%
rename from src/test/bench/shootout-spectralnorm.rs
rename to src/test/bench/shootout/shootout-spectralnorm.rs
diff --git a/src/test/bench/shootout-threadring.rs b/src/test/bench/shootout/shootout-threadring.rs
similarity index 100%
rename from src/test/bench/shootout-threadring.rs
rename to src/test/bench/shootout/shootout-threadring.rs
diff --git a/src/test/bench/core-map.rs b/src/test/bench/std/core-map.rs
similarity index 100%
rename from src/test/bench/core-map.rs
rename to src/test/bench/std/core-map.rs
diff --git a/src/test/bench/core-set.rs b/src/test/bench/std/core-set.rs
similarity index 100%
rename from src/test/bench/core-set.rs
rename to src/test/bench/std/core-set.rs
diff --git a/src/test/bench/core-std.rs b/src/test/bench/std/core-std.rs
similarity index 100%
rename from src/test/bench/core-std.rs
rename to src/test/bench/std/core-std.rs
diff --git a/src/test/bench/core-uint-to-str.rs b/src/test/bench/std/core-uint-to-str.rs
similarity index 100%
rename from src/test/bench/core-uint-to-str.rs
rename to src/test/bench/std/core-uint-to-str.rs
diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std/std-smallintmap.rs
similarity index 100%
rename from src/test/bench/std-smallintmap.rs
rename to src/test/bench/std/std-smallintmap.rs