From 9baf075c9f98f94b93045859250c23a11a07c03a Mon Sep 17 00:00:00 2001 From: Deepika Upadhyay Date: Thu, 19 Aug 2021 14:30:33 +0530 Subject: [PATCH] run-make-check: fix do_cmake not consuming run-make-check opts run-make-check.sh uses run-make.sh to `prepare`(install dependencies) and `configure` cmake options, without quotes these options containing special characters(hypens mostly) are skipped, hence we see not all options supplied at cmake configure step. Resolves(focused to solve issues in jenkins build env): - missing cmake options: cmake_opts+=" -DCMAKE_CXX_COMPILER=$cxx_compiler -DCMAKE_C_COMPILER=$c_compiler" cmake_opts+=" -DCMAKE_CXX_FLAGS_DEBUG=\-Werror" - Ninja not being used as cmake generator Signed-off-by: Deepika Upadhyay --- run-make-check.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run-make-check.sh b/run-make-check.sh index 7d64f968e12..6ef23f89a36 100755 --- a/run-make-check.sh +++ b/run-make-check.sh @@ -69,6 +69,7 @@ function main() { echo "Please fix 'hostname --fqdn', otherwise 'make check' will fail" return 1 fi + # uses run-make.sh to install-deps FOR_MAKE_CHECK=1 prepare local cxx_compiler=g++ local c_compiler=gcc @@ -98,7 +99,7 @@ function main() { if [ $WITH_PMEM ]; then cmake_opts+=" -DWITH_RBD_RWL=ON -DWITH_SYSTEM_PMDK=ON" fi - configure $cmake_opts $@ + configure "$cmake_opts" "$@" build tests echo "make check: successful build on $(git rev-parse HEAD)" run -- 2.39.5