You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2020/06/05 12:00:36 UTC
svn commit: r1878502 - in /httpd/httpd/trunk: .travis.yml
test/travis_run_linux.sh
Author: jorton
Date: Fri Jun 5 12:00:36 2020
New Revision: 1878502
URL: http://svn.apache.org/viewvc?rev=1878502&view=rev
Log:
Build with LDAP support for APR 1.x.
Dump end of error_log for test run failures.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/test/travis_run_linux.sh
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1878502&r1=1878501&r2=1878502&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Fri Jun 5 12:00:36 2020
@@ -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
# -------------------------------------------------------------------------
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1878502&r1=1878501&r2=1878502&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Fri Jun 5 12:00:36 2020
@@ -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