From 9d475520204dd5e0c1b5b9f7ce4c2882908a541f Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Fri, 27 Mar 2015 16:37:53 -0400 Subject: [PATCH] merge new changes in basic_test.cc --- test/basic_test.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/test/basic_test.cc b/test/basic_test.cc index f7b45be7..e3d114ad 100644 --- a/test/basic_test.cc +++ b/test/basic_test.cc @@ -61,16 +61,8 @@ void BM_pause_during(benchmark::State& state) { } BENCHMARK(BM_pause_during); BENCHMARK(BM_pause_during)->ThreadPerCpu(); - -void BM_pause_during_realtime(benchmark::State& state) { - state.UseRealTime(); - while(state.KeepRunning()) { - state.PauseTiming(); - state.ResumeTiming(); - } -} -BENCHMARK(BM_pause_during_realtime); -BENCHMARK(BM_pause_during_realtime)->ThreadPerCpu(); +BENCHMARK(BM_pause_during)->UseRealTime(); +BENCHMARK(BM_pause_during)->UseRealTime()->ThreadPerCpu(); void BM_spin_pause_after(benchmark::State& state) { while(state.KeepRunning()) {