diff options
Diffstat (limited to 'test/travis_before_linux.sh')
| -rwxr-xr-x | test/travis_before_linux.sh | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh index 2722c6a..59aea2f 100755 --- a/test/travis_before_linux.sh +++ b/test/travis_before_linux.sh @@ -21,42 +21,13 @@ if grep ip6-localhost /etc/hosts; then cat /etc/hosts fi -# Use a rudimental retry workflow as workaround to svn export hanging for minutes. -# Travis automatically kills a build if one step takes more than 10 minutes without -# reporting any progress. -function run_svn_export() { - local url=$1 - local revision=$2 - local dest_dir=$3 - local max_tries=$4 - - # Disable -e to allow fail/retry - set +e - - for i in $(seq 1 $max_tries) - do - timeout 60 svn export -r ${revision} --force -q $url $dest_dir - if [ $? -eq 0 ]; then - break - else - if [ $i -eq $max_tries ]; then - exit 1 - else - sleep $((100 * i)) - fi - fi - done - - # Restore -e behavior after fail/retry - set -e -} - function install_apx() { local name=$1 local version=$2 local root=https://svn.apache.org/repos/asf/apr/${name} local prefix=${HOME}/root/${name}-${version} local build=${HOME}/build/${name}-${version} + local giturl=https://github.com/apache/${name}.git local config=$3 local buildconf=$4 @@ -76,7 +47,7 @@ function install_apx() { return 0 fi - svn export -q -r ${revision} ${url} ${build} + git clone -q --depth=1 --branch=$version ${giturl} ${build} pushd $build ./buildconf ${buildconf} ./configure --prefix=${prefix} ${config} @@ -113,13 +84,13 @@ if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then unset pkgs # Make a shallow clone of httpd-tests git repo. - git clone --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework + git clone -q --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework 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: 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.centos7 test/ + docker build -t httpd_ldap -f test/travis_Dockerfile_slapd.centos test/ pushd test/perl-framework ./scripts/ldap-init.sh popd |