diff --git a/mace/core/testing/test_benchmark.cc b/mace/core/testing/test_benchmark.cc index f4c4c4d9b2df267e952b22512a0f02b43d4ad3c2..d01fffe33e78dcb69e3a2d817ea918c6fa92279b 100644 --- a/mace/core/testing/test_benchmark.cc +++ b/mace/core/testing/test_benchmark.cc @@ -37,9 +37,7 @@ Benchmark::Benchmark(const char *name, void (*benchmark_func)(int)) Register(); } -// Run all benchmarks -void Benchmark::Run() { Run("all"); } - +// Run all benchmarks that matches the pattern void Benchmark::Run(const char *pattern) { if (!all_benchmarks) return; diff --git a/mace/core/testing/test_benchmark.h b/mace/core/testing/test_benchmark.h index 96b883a4e58af23838132f548611b969c5812558..b6c070c71caf69dd4e4bad7eddd76d41808da9ce 100644 --- a/mace/core/testing/test_benchmark.h +++ b/mace/core/testing/test_benchmark.h @@ -20,10 +20,9 @@ #include #include -#define MACE_BENCHMARK_CONCAT(a, b, c) a##b##c -#define MACE_BENCHMARK(n) \ - static ::mace::testing::Benchmark *MACE_BENCHMARK_CONCAT( \ - __benchmark_, n, __LINE__) = (new ::mace::testing::Benchmark(#n, (n))) +#define MACE_BENCHMARK(n) \ + static ::mace::testing::Benchmark *__benchmark_##n = \ + (new ::mace::testing::Benchmark(#n, (n))) namespace mace { namespace testing { @@ -32,7 +31,6 @@ class Benchmark { public: Benchmark(const char *name, void (*benchmark_func)(int)); - static void Run(); static void Run(const char *pattern); private: