diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rwxr-xr-x | test/travis_run_linux.sh | 19 |
2 files changed, 17 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index b2d4e9608f..14d00d74d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,6 +43,9 @@ jobs: include: - name: Linux Ubuntu, Default module set # ------------------------------------------------------------------------- + - name: Empty APLOGNO() test + env: SKIP_TESTING=1 TEST_LOGNO=1 + # ------------------------------------------------------------------------- - name: Linux s390x Ubuntu, all-modules arch: s390x env: CONFIG="--enable-mods-shared=reallyall" @@ -296,7 +299,7 @@ jobs: # CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct # otherwise. before_install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then + - if [ "$TRAVIS_OS_NAME" = "linux" -a ! -v SKIP_TESTING ]; then cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib); CC=gcc cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV Protocol::HTTP2::Client FCGI Apache::Test; fi diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index 818e39a504..109494b167 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -1,4 +1,15 @@ #!/bin/bash -ex + +# Test for empty APLOGNO() macro use; if the script changes +# any files, the git diff will be non-empty and fail. +if test -v TEST_LOGNO; then + find server modules os -name \*.c | xargs perl \ + docs/log-message-tags/update-log-msg-tags + git diff --exit-code . + : PASSED + exit 0 +fi + ### Installed apr/apr-util don't include the *.m4 files but the ### Debian packages helpfully install them, so use the system APR to buildconf ./buildconf --with-apr=/usr/bin/apr-1-config ${BUILDCONFIG} @@ -75,7 +86,7 @@ if ! test -v SKIP_TESTING; then fi if grep -q 'Segmentation fault' test/perl-framework/t/logs/error_log; then - grep -C5 'Segmentation fault' test/perl-framework/t/logs/error_log + grep --color=always -C5 'Segmentation fault' test/perl-framework/t/logs/error_log RV=2 fi @@ -88,13 +99,9 @@ if ! test -v SKIP_TESTING; then # malloc errors are detected. This should get caught by the # segfault grep above, but in case it is not, catch it here too: if grep 'glibc detected' test/perl-framework/t/logs/error_log; then - grep -C20 'glibc detected' test/perl-framework/t/logs/error_log + grep --color=always -C20 'glibc detected' test/perl-framework/t/logs/error_log RV=4 fi - if test $RV -ne 0 -a -r test/perl-framework/t/logs/error_log; then - tail -n200 test/perl-framework/t/logs/error_log - fi - exit $RV fi |