From: Nathan Cutler <ncutler@suse.com>
Date: Mon, 19 Feb 2018 11:05:48 +0000 (+0100)
Subject: build/ops: run-make-check.sh: handle Python 2 absence
X-Git-Tag: v13.1.0~96^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a7908a9147819e8893c42eb5f9f1c612a1cbd801;p=ceph.git

build/ops: run-make-check.sh: handle Python 2 absence

Building Ceph without Python 2 requires passing certain options to cmake.

Fixes: http://tracker.ceph.com/issues/23035
Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/run-make-check.sh b/run-make-check.sh
index 86f7f2053bb5a..46745352cd80a 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -69,7 +69,12 @@ function run() {
     BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
     CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
 
-    $DRY_RUN ./do_cmake.sh -DWITH_FIO=ON $@ || return 1
+    CMAKE_PYTHON_OPTS=
+    if ! type python2 > /dev/null 2>&1 ; then
+        CMAKE_PYTHON_OPTS="-DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3"
+    fi
+
+    $DRY_RUN ./do_cmake.sh -DWITH_FIO=ON $CMAKE_PYTHON_OPTS $@ || return 1
     $DRY_RUN cd build
     $DRY_RUN make $BUILD_MAKEOPTS tests || return 1
     # prevent OSD EMFILE death on tests, make sure large than 1024