aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorIsmael <ijimenezm@hotmail.es>2016-06-02 19:01:10 +0200
committerIsmael <ijimenezm@hotmail.es>2016-06-02 19:01:10 +0200
commit212cfe1c2e659d9523cbc453917d0cdde4699bcd (patch)
tree366767e5aae6f5262b25efc20f9a523d22fd5260 /test
parent8c73d49b775610a4ee027a7f44b37962684a2370 (diff)
downloadgoogle-benchmark-212cfe1c2e659d9523cbc453917d0cdde4699bcd.tar.gz
removed check on automatic fit, to avoid random convergence misfits breaking the build
Diffstat (limited to 'test')
-rw-r--r--test/complexity_test.cc18
1 files changed, 3 insertions, 15 deletions
diff --git a/test/complexity_test.cc b/test/complexity_test.cc
index 9ef1f10..ed434fe 100644
--- a/test/complexity_test.cc
+++ b/test/complexity_test.cc
@@ -153,19 +153,15 @@ void BM_Complexity_O1(benchmark::State& state) {
}
state.SetComplexityN(state.range_x());
}
-BENCHMARK(BM_Complexity_O1)->Range(1, 1<<18)->Complexity();
BENCHMARK(BM_Complexity_O1)->Range(1, 1<<18)->Complexity(benchmark::o1);
BENCHMARK(BM_Complexity_O1)->Range(1, 1<<18)->Complexity([](size_t){return 1.0; });
+BENCHMARK(BM_Complexity_O1)->Range(1, 1<<18)->Complexity();
std::string big_o_1_test_name = "BM_Complexity_O1_BigO";
std::string rms_o_1_test_name = "BM_Complexity_O1_RMS";
std::string enum_auto_big_o_1 = "\\([0-9]+\\)";
std::string lambda_big_o_1 = "f\\(N\\)";
-// Add automatic tests
-ADD_COMPLEXITY_CASES(&ConsoleOutputTests, &JSONOutputTests, &CSVOutputTests,
- big_o_1_test_name, rms_o_1_test_name, enum_auto_big_o_1);
-
// Add enum tests
ADD_COMPLEXITY_CASES(&ConsoleOutputTests, &JSONOutputTests, &CSVOutputTests,
big_o_1_test_name, rms_o_1_test_name, enum_auto_big_o_1);
@@ -195,19 +191,15 @@ void BM_Complexity_O_N(benchmark::State& state) {
}
state.SetComplexityN(state.range_x());
}
-BENCHMARK(BM_Complexity_O_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity();
BENCHMARK(BM_Complexity_O_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity(benchmark::oN);
BENCHMARK(BM_Complexity_O_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity([](size_t n) -> double{return n; });
+BENCHMARK(BM_Complexity_O_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity();
std::string big_o_n_test_name = "BM_Complexity_O_N_BigO";
std::string rms_o_n_test_name = "BM_Complexity_O_N_RMS";
std::string enum_auto_big_o_n = "N";
std::string lambda_big_o_n = "f\\(N\\)";
-// Add automatic tests
-ADD_COMPLEXITY_CASES(&ConsoleOutputTests, &JSONOutputTests, &CSVOutputTests,
- big_o_n_test_name, rms_o_n_test_name, enum_auto_big_o_n);
-
// Add enum tests
ADD_COMPLEXITY_CASES(&ConsoleOutputTests, &JSONOutputTests, &CSVOutputTests,
big_o_n_test_name, rms_o_n_test_name, enum_auto_big_o_n);
@@ -227,19 +219,15 @@ static void BM_Complexity_O_N_log_N(benchmark::State& state) {
}
state.SetComplexityN(state.range_x());
}
-BENCHMARK(BM_Complexity_O_N_log_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity();
BENCHMARK(BM_Complexity_O_N_log_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity(benchmark::oNLogN);
BENCHMARK(BM_Complexity_O_N_log_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity([](size_t n) {return n * log2(n); });
+BENCHMARK(BM_Complexity_O_N_log_N) -> RangeMultiplier(2) -> Range(1<<10, 1<<16) -> Complexity();
std::string big_o_n_lg_n_test_name = "BM_Complexity_O_N_log_N_BigO";
std::string rms_o_n_lg_n_test_name = "BM_Complexity_O_N_log_N_RMS";
std::string enum_auto_big_o_n_lg_n = "NlgN";
std::string lambda_big_o_n_lg_n = "f\\(N\\)";
-// Add automatic tests
-ADD_COMPLEXITY_CASES(&ConsoleOutputTests, &JSONOutputTests, &CSVOutputTests,
- big_o_n_lg_n_test_name, rms_o_n_lg_n_test_name, enum_auto_big_o_n_lg_n);
-
// Add enum tests
ADD_COMPLEXITY_CASES(&ConsoleOutputTests, &JSONOutputTests, &CSVOutputTests,
big_o_n_lg_n_test_name, rms_o_n_lg_n_test_name, enum_auto_big_o_n_lg_n);