diff --git a/.travis.yml b/.travis.yml index 97d15662..50085bca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -153,7 +153,7 @@ script: -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_CXX_FLAGS="${EXTRA_FLAGS}" \ ${EXTRA_OPTS} ../rootbench - cmake --build . -- ctest || true +- ctest -L short || true - #find $HOME_FOLDER after_success: diff --git a/root/CMakeLists.txt b/root/CMakeLists.txt index 75c34cae..2a150a94 100644 --- a/root/CMakeLists.txt +++ b/root/CMakeLists.txt @@ -1,4 +1,4 @@ -#add_subdirectory(math) +add_subdirectory(math) add_subdirectory(io) add_subdirectory(interpreter) if (ROOT_roofit_FOUND AND ROOT_xml_FOUND) diff --git a/root/math/genvector/Cartesian3DBenchmarks.cxx b/root/math/genvector/Cartesian3DBenchmarks.cxx index 6264fdf3..791e36df 100644 --- a/root/math/genvector/Cartesian3DBenchmarks.cxx +++ b/root/math/genvector/Cartesian3DBenchmarks.cxx @@ -142,8 +142,8 @@ static void BM_Cartesian3D_Scale(benchmark::State &state) ComputeProcessedEntities(state, sizeof(T), VecTraits::Sum(checksum)); } -BENCHMARK_TEMPLATE(BM_Cartesian3D_Scale, double)->Range(8 << 10, 8 << 20); -BENCHMARK_TEMPLATE(BM_Cartesian3D_Scale, ROOT::Double_v)->Range(8 << 10, 8 << 20); +BENCHMARK_TEMPLATE(BM_Cartesian3D_Scale, double)->Range(8 << 10, 8 << 20)->Unit(benchmark::kMicrosecond); +BENCHMARK_TEMPLATE(BM_Cartesian3D_Scale, ROOT::Double_v)->Range(8 << 10, 8 << 20)->Unit(benchmark::kMicrosecond); // Define our main. BENCHMARK_MAIN();