From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 20 May 2019 23:35:10 +0000 (+0900)
Subject: Merge pull request #12510 from keszybz/test-directives
X-Git-Tag: v243-rc1~400
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=d7c5b3ec3e5ea446c252c07d30c32170d4d1176a;p=systemd%2F.git

Merge pull request #12510 from keszybz/test-directives

test: run check-directives.sh as part of the test suite
---

d7c5b3ec3e5ea446c252c07d30c32170d4d1176a
diff --cc travis-ci/managers/debian.sh
index df26b16e2c,c34bf4ba5f..dd9b816c98
--- a/travis-ci/managers/debian.sh
+++ b/travis-ci/managers/debian.sh
@@@ -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
diff --cc travis-ci/managers/fedora.sh
index f821ee2640,71c794821f..38cb3d3158
--- a/travis-ci/managers/fedora.sh
+++ b/travis-ci/managers/fedora.sh
@@@ -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
              ;;