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 4a022fec982bc69ae8a982467d5de73907d755ec..192a4001ff419b99a4d869d857f24c26db580e6d 100755 (executable)
--- 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 e40de9ca3af26659cab3bc84ae22f496e7f5cec1..e5fc1a91b05c1320fa297b6f92b0df72f200c34d 100755 (executable)
--- 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