]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #12510 from keszybz/test-directives
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 20 May 2019 23:35:10 +0000 (08:35 +0900)
committerGitHub <noreply@github.com>
Mon, 20 May 2019 23:35:10 +0000 (08:35 +0900)
test: run check-directives.sh as part of the test suite

1  2 
meson.build
travis-ci/managers/debian.sh
travis-ci/managers/fedora.sh
travis-ci/managers/xenial.sh

diff --cc meson.build
Simple merge
index df26b16e2c5b239fd3a4daa5b41a1dfaf24ff626,c34bf4ba5fe04e371b857e5563be645c3f5be2e8..dd9b816c986928a872e36b1bc66f892c13977eec
@@@ -44,10 -47,9 +47,9 @@@ for phase in "${PHASES[@]}"; d
              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
              ;;
          RUN_ASAN|RUN_CLANG_ASAN)
              if [[ "$phase" = "RUN_CLANG_ASAN" ]]; then
index f821ee264084691ab969735af08072934badd717,71c794821f64f032e95f2d79d306fed697a04e0e..38cb3d3158454a604890fd07bab79a68a0108486
@@@ -50,10 -58,9 +58,9 @@@ for phase in "${PHASES[@]}"; d
              $DOCKER_EXEC meson --werror -Dtests=unsafe -Dslow-tests=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 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
              ;;
Simple merge