This is an automated email from the ASF dual-hosted git repository. bbannier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 5f5180dc2168c85decfb97bb816a9fce4821261d Author: Benjamin Bannier <[email protected]> AuthorDate: Thu Aug 1 21:32:24 2019 +0200 Enabled parallel test runner in cmake build. Review: https://reviews.apache.org/r/69311/ --- cmake/MesosConfigure.cmake | 10 ++++++++++ src/tests/CMakeLists.txt | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cmake/MesosConfigure.cmake b/cmake/MesosConfigure.cmake index de7dc08..ca8d406 100644 --- a/cmake/MesosConfigure.cmake +++ b/cmake/MesosConfigure.cmake @@ -46,6 +46,16 @@ set(CMAKE_MACOSX_RPATH ON) ################################ enable_testing() +option(ENABLE_PARALLEL_TEST_EXECUTION "Execute tests in parallel" ON) +if (ENABLE_PARALLEL_TEST_EXECUTION) + set(TEST_DRIVER + "${PROJECT_SOURCE_DIR}/support/mesos-gtest-runner.py" CACHE STRING + "GTest driver to use") + mark_as_advanced(TEST_DRIVER) +else () + unset(TEST_DRIVER CACHE) +endif () + # CONFIGURE COMPILER. ##################### include(CompilationConfigure) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index faa0058..04c552a 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -382,4 +382,6 @@ endif () # ADD TEST TARGET (runs when you do, e.g., `make check`). ######################################################### -add_test(NAME MesosTests COMMAND mesos-tests) +add_test(NAME MesosTests COMMAND ${TEST_DRIVER} "${CMAKE_BINARY_DIR}/src/mesos-tests") +set_property(TEST MesosTests PROPERTY ENVIRONMENT + "MESOS_GTEST_RUNNER_FLAGS=--sequential=*ROOT_* $ENV{MESOS_GTEST_RUNNER_FLAGS}")
