[mesos] branch master updated: Renamed cmake parameter for parallel test execution.

[bb...@apache.org]

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


The following commit(s) were added to refs/heads/master by this push:
     new e1176c4  Renamed cmake parameter for parallel test execution.
e1176c4 is described below

commit e1176c453d04a8ef8f53cf23928b5bbb09173d78
Author: Benjamin Bannier <bb...@apache.org>
AuthorDate: Fri Aug 2 11:10:37 2019 +0200

    Renamed cmake parameter for parallel test execution.
    
    The Jenkins setup (which uses `support/docker-build.sh` under the
    covers) is parameterized with the  `CONFIGURATION` environment variable.
    While in we pass configure-style flags for both autotools and cmake
    builds to it in the Jenkins
    configuration, the script performs transformations so that
    configure-style flags are transformed to cmake-style (replace `_` with
    `-`, uppercase flags, replace `--` with `-D`).
    
    We disable parallel test execution in Jenkins by passing
    `--disable-parallel-test-execution` which with the transformations in
    `support/docker-build.sh` leads to a cmake arg
    `-DDISABLE_PARALLEL_TEST_EXECUTION=1`. This patch renames the cmake arg
    from a default enabled `ENABLE_PARALLEL_TEST_EXECUTION` to a default
    disabled `DISABLE_PARALLEL_TEST_EXECUTION` to support this workflow.
    
    Review: https://reviews.apache.org/r/71232/
---
 cmake/MesosConfigure.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/MesosConfigure.cmake b/cmake/MesosConfigure.cmake
index ca8d406..83d41ad 100644
--- a/cmake/MesosConfigure.cmake
+++ b/cmake/MesosConfigure.cmake
@@ -46,14 +46,14 @@ set(CMAKE_MACOSX_RPATH ON)
 ################################
 enable_testing()
 
-option(ENABLE_PARALLEL_TEST_EXECUTION "Execute tests in parallel" ON)
-if (ENABLE_PARALLEL_TEST_EXECUTION)
+option(DISABLE_PARALLEL_TEST_EXECUTION "Do not execute tests in parallel" OFF)
+if (DISABLE_PARALLEL_TEST_EXECUTION)
+  unset(TEST_DRIVER CACHE)
+else ()
   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.