From: Kefu Chai <kchai@redhat.com>
Date: Wed, 4 Mar 2020 14:09:31 +0000 (+0800)
Subject: run-make-check.sh: WITH_SEASTAR on demand
X-Git-Tag: v15.1.1~127^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=72a0ed4275235c4fc48ff558bc4ebfd491175610;p=ceph.git

run-make-check.sh: WITH_SEASTAR on demand

don't compile WITH_SEASTAR=ON unless required

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

diff --git a/run-make-check.sh b/run-make-check.sh
index 4a022fec982b..192a4001ff41 100755
--- a/run-make-check.sh
+++ b/run-make-check.sh
@@ -54,7 +54,11 @@ function main() {
     fi
     FOR_MAKE_CHECK=1 prepare
     # Init defaults after deps are installed.
-    configure " -DWITH_PYTHON3=3 -DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_SEASTAR=ON -DWITH_CEPHFS_SHELL=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF $@"
+    local cmake_opts=" -DWITH_PYTHON3=3 -DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_CEPHFS_SHELL=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF"
+    if [ $WITH_SEASTAR ]; then
+        cmake_opts+=" -DWITH_SEASTAR=ON"
+    fi
+    configure $cmake_opts $@
     build tests && echo "make check: successful run on $(git rev-parse HEAD)"
     run
 }
diff --git a/src/script/run-make.sh b/src/script/run-make.sh
index e40de9ca3af2..e5fc1a91b05c 100755
--- a/src/script/run-make.sh
+++ b/src/script/run-make.sh
@@ -88,7 +88,6 @@ function prepare() {
     fi
 
     if test -f ./install-deps.sh ; then
-	    export WITH_SEASTAR=1
 	    $DRY_RUN source ./install-deps.sh || return 1
         trap clean_up_after_myself EXIT
     fi