svn commit: r1879189 - in /httpd/httpd/branches/2.4.x: ./ test/travis_before_linux.sh

[jo...@apache.org]

Author: jorton
Date: Thu Jun 25 13:21:17 2020
New Revision: 1879189

URL: http://svn.apache.org/viewvc?rev=1879189&view=rev
Log:
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.



Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/test/travis_before_linux.sh

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1878993,1879103

Modified: httpd/httpd/branches/2.4.x/test/travis_before_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/test/travis_before_linux.sh?rev=1879189&r1=1879188&r2=1879189&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/test/travis_before_linux.sh (original)
+++ httpd/httpd/branches/2.4.x/test/travis_before_linux.sh Thu Jun 25 13:21:17 2020
@@ -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.