]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
run-make-check: fix do_cmake not consuming run-make-check opts 42842/head
authorDeepika Upadhyay <dupadhya@redhat.com>
Thu, 19 Aug 2021 09:00:33 +0000 (14:30 +0530)
committerDeepika Upadhyay <dupadhya@redhat.com>
Thu, 19 Aug 2021 12:58:56 +0000 (18:28 +0530)
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 <dupadhya@redhat.com>
run-make-check.sh

index 7d64f968e121d0c00a89eabe518a9b3047639d46..6ef23f89a36148987dcb0f38f3a07b332421450b 100755 (executable)
@@ -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