diff options
| author | Joe Orton <jorton@apache.org> | 2020-06-16 16:07:53 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-06-16 16:07:53 +0200 |
| commit | d76121b16728c14f2f0ba102f35e97312b935858 (patch) | |
| tree | a96df51f05087c3c60a7cd0f6492a15dd3a43f57 /test/travis_before_linux.sh | |
| parent | xforms (diff) | |
| download | apache2-d76121b16728c14f2f0ba102f35e97312b935858.tar.xz apache2-d76121b16728c14f2f0ba102f35e97312b935858.zip | |
Update Travis LDAP testing to use new container setup script
provided by test framework.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878889 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'test/travis_before_linux.sh')
| -rwxr-xr-x | test/travis_before_linux.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh index 4c8c991c68..e46ea65837 100755 --- a/test/travis_before_linux.sh +++ b/test/travis_before_linux.sh @@ -83,12 +83,11 @@ fi # For LDAP testing, run slapd listening on port 8389 and populate the # directory as described in t/modules/ldap.t in the test framework: -LDIF=test/perl-framework/scripts/httpd.ldif -if test -v TEST_LDAP -a -r $LDIF ; then - docker build -t httpd_slapd -f test/travis_Dockerfile_slapd test/ - docker run -d -p 8389:389 httpd_slapd | tee .slapd.cid - sleep 5 - ldapadd -H ldap://localhost:8389 -D cn=admin,dc=example,dc=com -w travis < $LDIF +if test -v TEST_LDAP -a -x test/perl-framework/scripts/ldap-init.sh; then + docker build -t httpd_ldap -f test/travis_Dockerfile_slapd test/ + pushd test/perl-framework + ./scripts/ldap-init.sh + popd fi if test -v APR_VERSION; then |