]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
build: switch the make check bot to Clang.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 2 Aug 2021 19:26:00 +0000 (19:26 +0000)
committerKefu Chai <kchai@redhat.com>
Mon, 16 Aug 2021 06:23:17 +0000 (14:23 +0800)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
run-make-check.sh
src/script/run-make.sh

index f0d0397f7021bcfc0d2990a8031048d3e252d47c..1e163509d8e63425fd089b2f151bb53f9a5ae4c8 100755 (executable)
@@ -70,8 +70,24 @@ function main() {
         return 1
     fi
     FOR_MAKE_CHECK=1 prepare
+    local cxx_compiler=g++
+    local c_compiler=gcc
+    for i in $(seq 14 -1 10); do
+        if type -t clang-$i > /dev/null; then
+            cxx_compiler="clang++-$i"
+            c_compiler="clang-$i"
+            break
+        fi
+    done
     # Init defaults after deps are installed.
-    local cmake_opts=" -DWITH_GTEST_PARALLEL=ON -DWITH_FIO=ON -DWITH_CEPHFS_SHELL=ON -DWITH_GRAFANA=ON -DWITH_SPDK=ON -DENABLE_GIT_VERSION=OFF"
+    local cmake_opts
+    cmake_opts+=" -DCMAKE_CXX_COMPILER=$cxx_compiler -DCMAKE_C_COMPILER=$c_compiler"
+    cmake_opts+=" -DENABLE_GIT_VERSION=OFF"
+    cmake_opts+=" -DWITH_GTEST_PARALLEL=ON"
+    cmake_opts+=" -DWITH_FIO=ON"
+    cmake_opts+=" -DWITH_CEPHFS_SHELL=ON"
+    cmake_opts+=" -DWITH_GRAFANA=ON"
+    cmake_opts+=" -DWITH_SPDK=ON"
     if [ $WITH_SEASTAR ]; then
         cmake_opts+=" -DWITH_SEASTAR=ON"
     fi
index 2c07b645fea0b593bbeccb71c602ae03f088e91d..159766b867ebe1594c994ebe203f5abe02742411 100755 (executable)
@@ -105,7 +105,7 @@ function prepare() {
         exit 1
     fi
     if [ -n "$install_cmd" ]; then
-        do_install "$install_cmd" ccache $which_pkg
+        do_install "$install_cmd" ccache $which_pkg clang
     else
         echo "WARNING: Don't know how to install packages" >&2
         echo "This probably means distribution $ID is not supported by run-make-check.sh" >&2