From: Kefu Chai <kchai@redhat.com>
Date: Thu, 2 Aug 2018 09:19:10 +0000 (+0800)
Subject: run-make-check: drop CMAKE_PYTHON_OPTS variable
X-Git-Tag: v14.0.1~695^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8bec1035ba5fe73eac18857dea2220a259c2a166;p=ceph.git

run-make-check: drop CMAKE_PYTHON_OPTS variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/run-make-check.sh b/run-make-check.sh
index e7571f2601067..bca8d78c33543 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -99,11 +99,10 @@ function run() {
     BUILD_MAKEOPTS=${BUILD_MAKEOPTS:-$DEFAULT_MAKEOPTS}
     test "$BUILD_MAKEOPTS" && echo "make will run with option(s) $BUILD_MAKEOPTS"
     CHECK_MAKEOPTS=${CHECK_MAKEOPTS:-$DEFAULT_MAKEOPTS}
+    CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON"
     if ! type python2 > /dev/null 2>&1 ; then
-        CMAKE_PYTHON_OPTS="-DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3"
+        CMAKE_BUILD_OPTS+=" -DWITH_PYTHON2=OFF -DWITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3"
     fi
-    CMAKE_BUILD_OPTS="-DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON"
-
     cat <<EOM
 Note that the binaries produced by this script do not contain correct time
 and git version information, which may make them unsuitable for debugging
@@ -111,7 +110,7 @@ and production use.
 EOM
     save_ccache_conf
     # remove the entropy generated by the date/time embedded in the build
-    CMAKE_BUILD_OPTS="$CMAKE_BUILD_OPTS -DENABLE_GIT_VERSION=OFF"
+    CMAKE_BUILD_OPTS+=" -DENABLE_GIT_VERSION=OFF"
     $DRY_RUN export SOURCE_DATE_EPOCH="946684800"
     $DRY_RUN ccache -o sloppiness=time_macros
     $DRY_RUN ccache -o run_second_cpp=true
@@ -126,7 +125,7 @@ EOM
     fi
     $DRY_RUN ccache -z # Reset the ccache statistics
 
-    $DRY_RUN ./do_cmake.sh $CMAKE_BUILD_OPTS $CMAKE_PYTHON_OPTS $@ || return 1
+    $DRY_RUN ./do_cmake.sh $CMAKE_BUILD_OPTS $@ || return 1
     $DRY_RUN cd build
     $DRY_RUN make $BUILD_MAKEOPTS tests || return 1