From: Luca Toscano <elukey@apache.org>
Date: Sat, 28 Dec 2019 08:29:30 +0000 (+0000)
Subject: test/travis_before_linux.sh: make for loop more resilient
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1741
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2688e472ff453bcf25c7804161c85ca0df6b2bb4;p=thirdparty%2Fapache%2Fhttpd.git

test/travis_before_linux.sh: make for loop more resilient

This is a follow up to my last commit to this file, to make
the for loop more resilient with the following:
- use --force in svn export, otherwise the second attempt will
  always fail due to the dest directory already present.
- exit 1 in case the 5 tries end up in a non zero exit code
  (to fail fast the build).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1872045 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 04f63d9202a..8e4543b46dc 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -5,8 +5,16 @@ if ! test -v SKIP_TESTING; then
    # reporting any progress.
    for i in {1..5} 
    do
-       timeout 60 svn export -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework
-       if [ $? -eq 0 ]; then break; else sleep 120; fi
+       timeout 60 svn export --force -q https://svn.apache.org/repos/asf/httpd/test/framework/trunk test/perl-framework
+       if [ $? -eq 0 ]; then
+           break
+       else
+           if [ $i -eq 5 ]; then
+               exit 1
+           else
+               sleep 120
+           fi
+       fi
    done
 fi