]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
run-make-check.sh: gtest-parallel only with Python 2
authorNathan Cutler <ncutler@suse.com>
Sat, 7 Jul 2018 07:04:39 +0000 (09:04 +0200)
committerNathan Cutler <ncutler@suse.com>
Mon, 9 Jul 2018 12:29:04 +0000 (14:29 +0200)
Fixes: http://tracker.ceph.com/issues/24817
Signed-off-by: Nathan Cutler <ncutler@suse.com>
run-make-check.sh

index 59abcbbf7c8bc8bf4403758141a559d629bb7607..5387403d54e17e8704d5fb0403c101fdeef5c3e2 100755 (executable)
@@ -92,12 +92,14 @@ function run() {
     test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
     CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
 
-    CMAKE_PYTHON_OPTS=
-    if ! type python2 > /dev/null 2>&1 ; then
-        CMAKE_PYTHON_OPTS="-DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3"
+    if type python2 > /dev/null 2>&1 ; then
+        # gtest-parallel requires Python 2
+        CMAKE_PYTHON_OPTS="-DWITH_GTEST_PARALLEL=ON"
+    else
+        CMAKE_PYTHON_OPTS="-DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3 -DWITH_GTEST_PARALLEL=OFF"
     fi
 
-    CMAKE_BUILD_OPTS="-DWITH_FIO=ON -DWITH_GTEST_PARALLEL=ON"
+    CMAKE_BUILD_OPTS="-DWITH_FIO=ON"
 
     cat <<EOM
 Note that the binaries produced by this script do not contain correct time