diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-09 13:26:57 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-05-09 18:17:28 +0200 |
| commit | 0b0673b61a777d642d5e4dfa06cca299339824b7 (patch) | |
| tree | 8250671ea106850f8e25d3b49eb78dcf31c13174 /travis-ci | |
| parent | e9bbff18e1cb7fc2ec209255c523780ad2e3dfce (diff) | |
| download | systemd-0b0673b61a777d642d5e4dfa06cca299339824b7.tar.gz | |
meson: default to -Dman=false to make development quicker
This makes the default build much quicker. If people are building systemd for
packaging or actual installation, they probably need to set some more options
anyway (-Ddns-servers=, -Dntp-servers=), so adding -Dman=true is not a big
burden.
For CIs configured locally, -Dman=true is added to restore status quo ante.
Diffstat (limited to 'travis-ci')
| -rwxr-xr-x | travis-ci/managers/debian.sh | 2 | ||||
| -rwxr-xr-x | travis-ci/managers/fedora.sh | 2 | ||||
| -rwxr-xr-x | travis-ci/managers/xenial.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh index 72ffcee439..df26b16e2c 100755 --- a/travis-ci/managers/debian.sh +++ b/travis-ci/managers/debian.sh @@ -44,7 +44,7 @@ for phase in "${PHASES[@]}"; do 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 $ENV_VARS -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-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 $DOCKER_EXEC tools/check-directives.sh diff --git a/travis-ci/managers/fedora.sh b/travis-ci/managers/fedora.sh index 760ed5b1ea..f821ee2640 100755 --- a/travis-ci/managers/fedora.sh +++ b/travis-ci/managers/fedora.sh @@ -53,7 +53,7 @@ for phase in "${PHASES[@]}"; do $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 build + docker exec -e CC=clang -e CXX=clang++ -it $CONT_NAME meson --werror -Dtests=unsafe -Dslow-tests=true -Dman=true build $DOCKER_EXEC ninja -v -C build $DOCKER_EXEC ninja -C build test ;; diff --git a/travis-ci/managers/xenial.sh b/travis-ci/managers/xenial.sh index 4822bdd4b7..71a65e406d 100755 --- a/travis-ci/managers/xenial.sh +++ b/travis-ci/managers/xenial.sh @@ -12,7 +12,7 @@ cd $REPO_ROOT sed -i 's/2\.30/2.27/' meson.build -meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true build +meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true -Dman=true build ninja -v -C build make -C test/TEST-01-BASIC clean setup run TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no |