diff options
| author | Evgeny Vereshchagin <evvers@ya.ru> | 2018-12-24 04:03:40 +0100 |
|---|---|---|
| committer | Evgeny Vereshchagin <evvers@ya.ru> | 2018-12-29 19:14:35 +0100 |
| commit | 8934737154a7d8a6f9809ac33f634f5b80443bd9 (patch) | |
| tree | e90ae155465b41f84427cf311bf6f8c1c74e682a /travis-ci | |
| parent | 082bcdca2cff8e421e7207ad20ab3aa931ba2833 (diff) | |
| download | systemd-8934737154a7d8a6f9809ac33f634f5b80443bd9.tar.gz | |
travis: merge RUN_CLANG into RUN
They are basically the same except that a couple of environment variables
have to be passed for building systemd with clang.
Diffstat (limited to 'travis-ci')
| -rwxr-xr-x | travis-ci/managers/debian.sh | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh index 976e926c82..587049bfa7 100755 --- a/travis-ci/managers/debian.sh +++ b/travis-ci/managers/debian.sh @@ -40,18 +40,15 @@ for phase in "${PHASES[@]}"; do $DOCKER_EXEC apt-get -y build-dep systemd $DOCKER_EXEC apt-get -y install "${ADDITIONAL_DEPS[@]}" ;; - RUN) - info "Run phase" - $DOCKER_EXEC meson --werror -Dtests=unsafe -Dslow-tests=true -Dsplit-usr=true build + RUN|RUN_CLANG) + if [[ "$phase" = "RUN_CLANG" ]]; then + ENV_VARS="-e CC=clang -e CXX=clang++" + fi + docker exec $ENV_VARS -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dsplit-usr=true build $DOCKER_EXEC ninja -v -C build $DOCKER_EXEC ninja -C build test $DOCKER_EXEC tools/check-directives.sh ;; - RUN_CLANG) - docker exec -e CC=clang -e CXX=clang++ -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dsplit-usr=true build - $DOCKER_EXEC ninja -v -C build - $DOCKER_EXEC ninja -C build test - ;; RUN_ASAN|RUN_CLANG_ASAN) if [[ "$phase" = "RUN_CLANG_ASAN" ]]; then ENV_VARS="-e CC=clang -e CXX=clang++" |