Move benchmarks to top-level directory

jupp0r · Oct 26, 2018 · 01a8e63 · 01a8e63
1 parent 2f61ba4
commit 01a8e63
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ script:
   - bazel build //...
   - bazel test --test_output=all //core/... //pull/...
   - bazel test --test_output=all //pull/tests/integration:scrape-test
-  - bazel run -c opt //core/tests/benchmark
+  - bazel run -c opt //core/benchmarks
 
   - pushd .
   - mkdir _build_internal_deps

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -46,3 +46,7 @@ install(
 if(ENABLE_TESTING)
   add_subdirectory(tests)
 endif()
+
+if(GoogleBenchmark_FOUND)
+  add_subdirectory(benchmarks)
+endif()
diff --git a/core/tests/benchmark/BUILD.bazel → core/benchmarks/BUILD.bazel b/core/tests/benchmark/BUILD.bazel → core/benchmarks/BUILD.bazel
@@ -1,5 +1,5 @@
 cc_binary(
-    name = "benchmark",
+    name = "benchmarks",
     srcs = glob([
         "*.cc",
         "*.h",

diff --git a/core/tests/benchmark/CMakeLists.txt → core/benchmarks/CMakeLists.txt b/core/tests/benchmark/CMakeLists.txt → core/benchmarks/CMakeLists.txt
diff --git a/core/tests/benchmark/benchmark_helpers.cc → core/benchmarks/benchmark_helpers.cc b/core/tests/benchmark/benchmark_helpers.cc → core/benchmarks/benchmark_helpers.cc
diff --git a/core/tests/benchmark/benchmark_helpers.h → core/benchmarks/benchmark_helpers.h b/core/tests/benchmark/benchmark_helpers.h → core/benchmarks/benchmark_helpers.h
diff --git a/core/tests/benchmark/counter_bench.cc → core/benchmarks/counter_bench.cc b/core/tests/benchmark/counter_bench.cc → core/benchmarks/counter_bench.cc
diff --git a/core/tests/benchmark/gauge_bench.cc → core/benchmarks/gauge_bench.cc b/core/tests/benchmark/gauge_bench.cc → core/benchmarks/gauge_bench.cc
diff --git a/core/tests/benchmark/histogram_bench.cc → core/benchmarks/histogram_bench.cc b/core/tests/benchmark/histogram_bench.cc → core/benchmarks/histogram_bench.cc
diff --git a/core/tests/benchmark/main.cc → core/benchmarks/main.cc b/core/tests/benchmark/main.cc → core/benchmarks/main.cc
diff --git a/core/tests/benchmark/registry_bench.cc → core/benchmarks/registry_bench.cc b/core/tests/benchmark/registry_bench.cc → core/benchmarks/registry_bench.cc
diff --git a/core/tests/benchmark/summary_bench.cc → core/benchmarks/summary_bench.cc b/core/tests/benchmark/summary_bench.cc → core/benchmarks/summary_bench.cc
diff --git a/core/tests/CMakeLists.txt b/core/tests/CMakeLists.txt
@@ -1,8 +1,4 @@
 
-if(GoogleBenchmark_FOUND)
-  add_subdirectory(benchmark)
-endif()
-
 add_executable(prometheus_test
   check_names_test.cc
   counter_test.cc