From 72a0ed4275235c4fc48ff558bc4ebfd491175610 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 4 Mar 2020 22:09:31 +0800 Subject: [PATCH] run-make-check.sh: WITH_SEASTAR on demand don't compile WITH_SEASTAR=ON unless required Signed-off-by: Kefu Chai --- run-make-check.sh | 6 +++++- src/script/run-make.sh | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/run-make-check.sh b/run-make-check.sh index 4a022fec982..192a4001ff4 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 e40de9ca3af..e5fc1a91b05 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 -- 2.47.3