diff options
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rwxr-xr-x | test/travis_run_linux.sh | 4 |
2 files changed, 14 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 83f2659c9b..57f07ac1e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ addons: - libnghttp2-dev - libjansson-dev - libpcre2-dev + - libldap2-dev env: global: - MFLAGS=-j2 @@ -60,7 +61,7 @@ jobs: NOTEST_CFLAGS="-Werror" CC="gcc -m32" APR_VERSION=1.7.0 - APU_VERSION=1.6.1 APU_CONFIG="--with-crypto" + APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap" addons: apt: sources: @@ -74,6 +75,7 @@ jobs: - lib32z1-dev - libbrotli-dev:i386 - libpcre2-dev:i386 + - libldap2-dev:i386 - libtool-bin - perl-doc - libapr1-dev @@ -127,6 +129,7 @@ jobs: - libnghttp2-dev - libjansson-dev - libpcre2-dev + - libldap2-dev # ------------------------------------------------------------------------- - name: Linux Ubuntu, GCC 9 maintainer-mode w/-Werror env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-9 @@ -148,6 +151,7 @@ jobs: - libnghttp2-dev - libjansson-dev - libpcre2-dev + - libldap2-dev # ------------------------------------------------------------------------- - name: Linux Ubuntu, GCC 10 maintainer-mode w/-Werror env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-10 @@ -169,6 +173,7 @@ jobs: - libnghttp2-dev - libjansson-dev - libpcre2-dev + - libldap2-dev # ------------------------------------------------------------------------- # MFLAGS= works around https://bz.apache.org/bugzilla/show_bug.cgi?id=63942 - if: *condition_not_24x @@ -193,22 +198,22 @@ jobs: dist: xenial env: APR_VERSION=1.7.0 APU_VERSION=1.6.1 CONFIG="--enable-mods-shared=reallyall" - APU_CONFIG="--with-crypto" + APU_CONFIG="--with-crypto --with-ldap" # ------------------------------------------------------------------------- - name: Linux Ubuntu, APR 1.7.0, APR-util 1.6.1 env: APR_VERSION=1.7.0 APU_VERSION=1.6.1 CONFIG="--enable-mods-shared=reallyall" - APU_CONFIG="--with-crypto" + APU_CONFIG="--with-crypto --with-ldap" # ------------------------------------------------------------------------- - name: Linux Ubuntu, APR 1.7.x, APR-util 1.7.x env: APR_VERSION=1.7.x APU_VERSION=1.7.x CONFIG="--enable-mods-shared=reallyall" - APU_CONFIG="--with-crypto" + APU_CONFIG="--with-crypto --with-ldap" CLEAR_CACHE=1 # ------------------------------------------------------------------------- - name: Linux Ubuntu, APR 1.7.0 --enable-pool-debug, APR-util 1.6.1 env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug" - APU_VERSION=1.6.1 APU_CONFIG="--with-crypto" + APU_VERSION=1.6.1 APU_CONFIG="--with-crypto --with-ldap" CONFIG="--enable-mods-shared=reallyall" TEST_MALLOC=1 # ------------------------------------------------------------------------- diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index f8fd6c5c4e..54336aaf3c 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -90,5 +90,9 @@ if ! test -v SKIP_TESTING; then RV=4 fi + if test $RV -ne 0 -a -r test/perl-framework/t/logs/error_log; then + tail test/perl-framework/t/logs/error_log + fi + exit $RV fi |