From: Joe Orton <jorton@apache.org>
Date: Tue, 23 Jun 2020 07:24:03 +0000 (+0000)
Subject: Add workaround for IPv6 configuration on non-x86 hosts which
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b4468534f9896b011650fc3fc9c10e2618dc3aa;p=thirdparty%2Fapache%2Fhttpd.git

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/trunk@1879103 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 58a48ec5fcd..f30bf45082e 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -11,6 +11,16 @@ fi
 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.