run-make-check.sh: gtest-parallel only with Python 2

Conflicts:
run-make-check.sh

Fixes: http://tracker.ceph.com/issues/24817
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3d6909b0f35b64c4df6bd6280277d9b341bbd06e)

diff --git a/run-make-check.sh b/run-make-check.sh
index ab16ef97e055bd88f75ba9b9aa0a76a43b6fe0c1..db52a6880f41f200a1e527a06044de02481c853a 100755 (executable)
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -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=""
 
     cat <<EOM
 Note that the binaries produced by this script do not contain correct time