From c2144eeac27522ca467fa351b1ade05113d16f20 Mon Sep 17 00:00:00 2001
From: Nathan Cutler <ncutler@suse.com>
Date: Sat, 7 Jul 2018 09:04:39 +0200
Subject: [PATCH] run-make-check.sh: gtest-parallel only with Python 2

Fixes: http://tracker.ceph.com/issues/24817
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3d6909b0f35b64c4df6bd6280277d9b341bbd06e)
Signed-off-by: Jonathan Brielmaier <jbrielmaier@suse.de>
---
 run-make-check.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/run-make-check.sh b/run-make-check.sh
index 59abcbbf7c8bc..5387403d54e17 100755
--- 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="-DWITH_FIO=ON"
 
     cat <<EOM
 Note that the binaries produced by this script do not contain correct time
-- 
2.39.5