]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #12519 from keszybz/man-on-demand
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 20 May 2019 23:25:26 +0000 (08:25 +0900)
committerGitHub <noreply@github.com>
Mon, 20 May 2019 23:25:26 +0000 (08:25 +0900)
Build man pages on demand only

1  2 
meson.build
semaphoreci/semaphore-runner.sh
travis-ci/managers/xenial.sh

diff --cc meson.build
Simple merge
Simple merge
index 33b40e63c51506c2cc2d09a951e400ccdc5805e7,71a65e406decbaa14dde601b9adb7dceb2b92afa..8995a51f84e4ceb7d3048e971261a94d002febaf
@@@ -13,10 -12,9 +13,10 @@@ cd ${REPO_ROOT:-$(pwd)
  
  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
 +
 +make -C test/TEST-01-BASIC clean setup run NSPAWN_TIMEOUT=600 TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no
  
  # Now that we're more or less sure that ASan isn't going to crash systemd and cause a kernel panic
  # let's also run the test with QEMU to cover udevd, sysctl and everything else that isn't run