From ca0f86d16a5b3d70a27cef82c4fa91310d70b1c2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 10 Jan 2021 15:39:24 +0000 Subject: [PATCH] ci: do not build with --optimization=1 with Clang --- .github/workflows/ubuntu-unit-tests.sh | 3 +-- travis-ci/managers/debian.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ubuntu-unit-tests.sh b/.github/workflows/ubuntu-unit-tests.sh index 831eab97f8a..705b147b962 100755 --- a/.github/workflows/ubuntu-unit-tests.sh +++ b/.github/workflows/ubuntu-unit-tests.sh @@ -41,9 +41,8 @@ for phase in "${PHASES[@]}"; do if [[ "$phase" = "RUN_CLANG" ]]; then export CC=clang export CXX=clang++ - MESON_ARGS=(--optimization=1) fi - meson --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dman=true "${MESON_ARGS[@]}" build + meson --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dman=true build ninja -C build -v meson test -C build --print-errorlogs ;; diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh index ad6306744cf..39fbb3d65c6 100755 --- a/travis-ci/managers/debian.sh +++ b/travis-ci/managers/debian.sh @@ -62,9 +62,8 @@ for phase in "${PHASES[@]}"; do RUN|RUN_GCC|RUN_CLANG) if [[ "$phase" = "RUN_CLANG" ]]; then ENV_VARS="-e CC=clang -e CXX=clang++" - MESON_ARGS="--optimization=1" fi - docker exec $ENV_VARS -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dsplit-usr=true -Dman=true $MESON_ARGS build + docker exec $ENV_VARS -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dsplit-usr=true -Dman=true build $DOCKER_EXEC ninja -v -C build docker exec -e "TRAVIS=$TRAVIS" -it $CONT_NAME ninja -C build test ;; -- 2.47.3