Changeset 22a737b in mod_gnutls

Timestamp:

Jun 25, 2020, 4:01:21 AM (9 days ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

2b3a2814

Parents:

ed493e6

Message:

Detect usable loopback IPs during ./configure

Files:

• .github/workflows/build.yml (modified) (1 diff)
• .github/workflows/valgrind.yml (modified) (1 diff)
• configure.ac (modified) (1 diff)
• test/README.md (modified) (1 diff)
• test/check_test_ips.py (added)

.github/workflows/build.yml

@@ -37 +37 @@
           cat /etc/hosts
       - name: find usable IPs for tests
-        shell: python3 {0}
         run: |
-          import socket
-          def try_connect(sockaddr):
-              af, socktype, proto, canonname, sa = sockaddr
-              try:
-                  s = socket.socket(af, socktype, proto)
-                  s.connect(sa)
-              except:
-                  return False
-              finally:
-                  s.close()
-              return True
-
-          test_ips = []
-          for name in ['localhost', socket.gethostname()]:
-              addrs = list(map(lambda t: t[-1][0], filter(try_connect, socket.getaddrinfo(name, 123, proto=socket.IPPROTO_UDP))))
-              print(f'{name}: {addrs}')
-              test_ips += addrs
-          # IPv6 addresses must be enclosed in square brackets
-          test_ips = [f'[{i}]' if ':' in i else i for i in test_ips]
-          print(f'::set-env name=test_ips::{" ".join(test_ips)}')
+          echo "::set-env name=test_ips::$(python3 test/check_test_ips.py localhost $(hostname))"
       - name: set prefix for container-specific artifacts
         # this is because upload-artifact doesn't like ":" in file names

.github/workflows/valgrind.yml

@@ -29 +29 @@
         run: autoreconf -fiv
       - name: configure
-        run: TEST_IP=127.0.0.1 APACHE_MUTEX=pthread ./configure --enable-valgrind-test
+        run: APACHE_MUTEX=pthread ./configure --enable-valgrind-test
       - name: store config.log
         uses: actions/upload-artifact@v1

configure.ac

@@ -251 +251 @@
 AM_SUBST_NOTMAKE(PID_AFFIX)
 
+AC_MSG_CHECKING([which loopback addresses are usable])
+loopback_ips="$("${PYTHON}" test/check_test_ips.py -q ::1 127.0.0.1)"
+AC_MSG_RESULT(${loopback_ips})
+
 # assign default values to TEST_HOST and TEST_IP if necessary
 : ${TEST_HOST:="localhost"}
-: ${TEST_IP:="[[::1]] 127.0.0.1"}
+: ${TEST_IP:="${loopback_ips}"}
 AC_ARG_VAR([TEST_HOST], [Host name to use for server instances started by \
                         "make check", must resolve to addresses in TEST_IP. \

test/README.md

@@ -30 +30 @@
 directories in `tests/`.
 
-The default configuration assumes that a loopback device with IPv4 and
-IPv6 support is available (`TEST_IP="[::1] 127.0.0.1"`) and that
-`TEST_HOST="localhost"` resolves to both of these addresses. If this
-does not apply to your system (e.g. most Docker containers), you can
-pass different values to `./configure`, e.g. to use IPv4 only:
+The default configuration assumes that a loopback device is available,
+and that `TEST_HOST="localhost"` resolves to the IPv6 and IPv4
+loopback addresses. `./configure` checks if `[::1]` and `127.0.0.1`
+are available, if one isn't it will be disabled. You can override the
+defaults by passing different values to `./configure`, e.g. to
+unconditionally use IPv4 only:
 
 ```bash
 $ TEST_HOST="localhost" TEST_IP="127.0.0.1" ./configure
 ```
+
+Note that having less than two addresses in `TEST_IP` will lead to
+some tests being skipped.
 
 If tests fail due to expired certificates or PGP signatures, run