Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "src/test/bench: restructure"

This reverts commit 14cdc26.
  • Loading branch information...
commit d7be86f1a52010f6f89cebbc9750c9a3596d31f9 1 parent f585767
@cmr cmr authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 mk/tests.mk
  2. 0  src/test/bench/{std → }/core-map.rs
  3. 0  src/test/bench/{std → }/core-set.rs
  4. 0  src/test/bench/{std → }/core-std.rs
  5. 0  src/test/bench/{std → }/core-uint-to-str.rs
  6. 0  src/test/bench/{rt → }/msgsend-pipes-shared.rs
  7. 0  src/test/bench/{rt → }/msgsend-pipes.rs
  8. 0  src/test/bench/{rt → }/msgsend-ring-mutex-arcs.rs
  9. 0  src/test/bench/{rt → }/msgsend-ring-rw-arcs.rs
  10. 0  src/test/bench/{rt → }/rt-messaging-ping-pong.rs
  11. 0  src/test/bench/{rt → }/rt-parfib.rs
  12. 0  src/test/bench/{rt → }/rt-spawn-rate.rs
  13. 0  src/test/bench/{shootout → }/shootout-ackermann.rs
  14. 0  src/test/bench/{shootout → }/shootout-binarytrees.rs
  15. 0  src/test/bench/{shootout → }/shootout-chameneos-redux.rs
  16. 0  src/test/bench/{shootout → }/shootout-fannkuch-redux.rs
  17. 0  src/test/bench/{shootout → }/shootout-fasta-redux.rs
  18. 0  src/test/bench/{shootout → }/shootout-fasta.rs
  19. 0  src/test/bench/{shootout → }/shootout-fibo.rs
  20. 0  src/test/bench/{shootout → }/shootout-k-nucleotide-pipes.rs
  21. 0  src/test/bench/{shootout → }/shootout-k-nucleotide.data
  22. 0  src/test/bench/{shootout → }/shootout-k-nucleotide.rs
  23. 0  src/test/bench/{shootout → }/shootout-mandelbrot.rs
  24. 0  src/test/bench/{shootout → }/shootout-nbody.rs
  25. 0  src/test/bench/{shootout → }/shootout-pfib.rs
  26. 0  src/test/bench/{shootout → }/shootout-pidigits.rs
  27. 0  src/test/bench/{shootout → }/shootout-reverse-complement.rs
  28. 0  src/test/bench/{shootout → }/shootout-spectralnorm.rs
  29. 0  src/test/bench/{shootout → }/shootout-threadring.rs
  30. 0  src/test/bench/{std → }/std-smallintmap.rs
  31. 0  src/test/bench/{rt → }/task-perf-alloc-unwind.rs
  32. 0  src/test/bench/{rt → }/task-perf-jargon-metal-smoke.rs
  33. 0  src/test/bench/{rt → }/task-perf-linked-failure.rs
  34. 0  src/test/bench/{rt → }/task-perf-one-million.rs
  35. 0  src/test/bench/{rt → }/task-perf-spawnalot.rs
View
4 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)
View
0  src/test/bench/std/core-map.rs → src/test/bench/core-map.rs
File renamed without changes
View
0  src/test/bench/std/core-set.rs → src/test/bench/core-set.rs
File renamed without changes
View
0  src/test/bench/std/core-std.rs → src/test/bench/core-std.rs
File renamed without changes
View
0  src/test/bench/std/core-uint-to-str.rs → src/test/bench/core-uint-to-str.rs
File renamed without changes
View
0  src/test/bench/rt/msgsend-pipes-shared.rs → src/test/bench/msgsend-pipes-shared.rs
File renamed without changes
View
0  src/test/bench/rt/msgsend-pipes.rs → src/test/bench/msgsend-pipes.rs
File renamed without changes
View
0  src/test/bench/rt/msgsend-ring-mutex-arcs.rs → src/test/bench/msgsend-ring-mutex-arcs.rs
File renamed without changes
View
0  src/test/bench/rt/msgsend-ring-rw-arcs.rs → src/test/bench/msgsend-ring-rw-arcs.rs
File renamed without changes
View
0  src/test/bench/rt/rt-messaging-ping-pong.rs → src/test/bench/rt-messaging-ping-pong.rs
File renamed without changes
View
0  src/test/bench/rt/rt-parfib.rs → src/test/bench/rt-parfib.rs
File renamed without changes
View
0  src/test/bench/rt/rt-spawn-rate.rs → src/test/bench/rt-spawn-rate.rs
File renamed without changes
View
0  ...test/bench/shootout/shootout-ackermann.rs → src/test/bench/shootout-ackermann.rs
File renamed without changes
View
0  ...st/bench/shootout/shootout-binarytrees.rs → src/test/bench/shootout-binarytrees.rs
File renamed without changes
View
0  ...ench/shootout/shootout-chameneos-redux.rs → src/test/bench/shootout-chameneos-redux.rs
File renamed without changes
View
0  ...bench/shootout/shootout-fannkuch-redux.rs → src/test/bench/shootout-fannkuch-redux.rs
File renamed without changes
View
0  ...st/bench/shootout/shootout-fasta-redux.rs → src/test/bench/shootout-fasta-redux.rs
File renamed without changes
View
0  src/test/bench/shootout/shootout-fasta.rs → src/test/bench/shootout-fasta.rs
File renamed without changes
View
0  src/test/bench/shootout/shootout-fibo.rs → src/test/bench/shootout-fibo.rs
File renamed without changes
View
0  ...h/shootout/shootout-k-nucleotide-pipes.rs → ...test/bench/shootout-k-nucleotide-pipes.rs
File renamed without changes
View
0  ...bench/shootout/shootout-k-nucleotide.data → src/test/bench/shootout-k-nucleotide.data
File renamed without changes
View
0  ...t/bench/shootout/shootout-k-nucleotide.rs → src/test/bench/shootout-k-nucleotide.rs
File renamed without changes
View
0  ...est/bench/shootout/shootout-mandelbrot.rs → src/test/bench/shootout-mandelbrot.rs
File renamed without changes
View
0  src/test/bench/shootout/shootout-nbody.rs → src/test/bench/shootout-nbody.rs
File renamed without changes
View
0  src/test/bench/shootout/shootout-pfib.rs → src/test/bench/shootout-pfib.rs
File renamed without changes
View
0  src/test/bench/shootout/shootout-pidigits.rs → src/test/bench/shootout-pidigits.rs
File renamed without changes
View
0  ...h/shootout/shootout-reverse-complement.rs → ...test/bench/shootout-reverse-complement.rs
File renamed without changes
View
0  ...t/bench/shootout/shootout-spectralnorm.rs → src/test/bench/shootout-spectralnorm.rs
File renamed without changes
View
0  ...est/bench/shootout/shootout-threadring.rs → src/test/bench/shootout-threadring.rs
File renamed without changes
View
0  src/test/bench/std/std-smallintmap.rs → src/test/bench/std-smallintmap.rs
File renamed without changes
View
0  src/test/bench/rt/task-perf-alloc-unwind.rs → src/test/bench/task-perf-alloc-unwind.rs
File renamed without changes
View
0  .../bench/rt/task-perf-jargon-metal-smoke.rs → ...est/bench/task-perf-jargon-metal-smoke.rs
File renamed without changes
View
0  ...test/bench/rt/task-perf-linked-failure.rs → src/test/bench/task-perf-linked-failure.rs
File renamed without changes
View
0  src/test/bench/rt/task-perf-one-million.rs → src/test/bench/task-perf-one-million.rs
File renamed without changes
View
0  src/test/bench/rt/task-perf-spawnalot.rs → src/test/bench/task-perf-spawnalot.rs
File renamed without changes

5 comments on commit d7be86f

@bors
Collaborator

saw approval from cmr
at cmr@d7be86f

@bors
Collaborator

merging cmr/rust/test-restructure = d7be86f into auto

@bors
Collaborator

cmr/rust/test-restructure = d7be86f merged ok, testing candidate = 6a22595

@bors
Collaborator

fast-forwarding master to auto = 6a22595

Please sign in to comment.
Something went wrong with that request. Please try again.