From: Joe Orton <jorton@apache.org>
Date: Thu, 25 Jun 2020 13:21:17 +0000 (+0000)
Subject: Merge r1878993, r1879103 from trunk:
X-Git-Tag: 2.4.44~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16961d09d9ac57d0ea142fbd25424629befda4bb;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1878993, r1879103 from trunk:

For diagnosing weird non-x86 failures, dump /etc/hosts in future runs.


Add workaround for IPv6 configuration on non-x86 hosts which
appears to fix the connection failures.  Almost certainly a bug
here, not at all sure where.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879189 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index e46ea658379..f30bf45082e 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -7,6 +7,20 @@ fi
 : Travis tag = ${TRAVIS_TAG}
 : Travis branch = ${TRAVIS_BRANCH}
 
+: /etc/hosts --
+cat /etc/hosts
+: -- ends
+
+# ### FIXME: This is a workaround, non-x86 builds have an IPv6
+# configuration which somehow breaks the test suite runs.  Appears
+# that Apache::Test only configures the server to Listen on 0.0.0.0
+# (that is hard-coded), but then Apache::TestSerer::wait_till_is_up()
+# tries to connect via ::1, which fails/times out.
+if grep ip6-localhost /etc/hosts; then
+    sudo sed -i "/ip6-/d" /etc/hosts
+    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.