Commit Diff

Commit:
5a345722826201a4da926abc096aed76de3cdaa4
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
use REGRESS_HOST to specify the host to listen to; use in CI some CI envs don't like `listen on localhost' but tolerate INADDR_ANY or IN6ADDR_ANY_INIT.
Actions:
Patch | Tree
commit - a7a998ac9b5c17d6e689569d8284ac288c64bf09
commit + 5a345722826201a4da926abc096aed76de3cdaa4
blob - 27b7e8c5bb6c72d6b5d8cc93a563005f45db6e7d
blob + 1583889d677c41870f3e9d0a0b3af69666aa547e
--- .cirrus.yml
+++ .cirrus.yml
@@ -5,7 +5,7 @@ linux_amd64_task:
     - apk add alpine-sdk linux-headers bison libretls-dev libevent-dev
     - ./configure CFLAGS='-O2 -pipe -Wno-deprecated-declarations' -Werror
     - make
-    - make regress
+    - make regress REGRESS_HOST="*"
 
 linux_arm_task:
   arm_container:
@@ -14,7 +14,7 @@ linux_arm_task:
     - apk add alpine-sdk linux-headers bison libretls-dev libevent-dev
     - ./configure CFLAGS='-O2 -pipe -Wno-deprecated-declarations' -Werror
     - make
-    - make regress
+    - make regress REGRESS_HOST="*"
 
 freebsd_13_task:
   freebsd_instance:
blob - ce1f833b4463968f9d734be266e68228e93f137c
blob + 99a4cdefd9df35affc6ff0099abc990b73adb4b5
--- Makefile
+++ Makefile
@@ -18,6 +18,9 @@
 # all.
 TESTS=
 
+# host to bind to during regress
+REGRESS_HOST =	localhost
+
 # -- build-related variables --
 
 COBJS =		${COMPATS:.c=.o}
blob - a0feea082634e7e804d43524aa22808afd472868
blob + ed79b78cce1bed4a060b932dc300da3eb80a9fd4
--- regress/Makefile
+++ regress/Makefile
@@ -2,6 +2,9 @@
 # all.
 TESTS=
 
+# host to bind to during regress
+REGRESS_HOST =	localhost
+
 DISTFILES =	Makefile \
 		env \
 		err \
@@ -34,7 +37,7 @@ IRI_OBJS =	${IRI_SRCS:.c=.o} ${REG_COMPATS}
 .PHONY: all data clean dist
 
 all: data puny-test iri_test fcgi-test
-	./regress ${TESTS}
+	env REGRESS_HOST="${REGRESS_HOST}" ./regress ${TESTS}
 
 data: testdata cert.pem testca.pem valid.crt invalid.cert.pem
 
blob - 06cb7a7762eaabf6718673fa06c8ede41211fce2
blob + 05f325261c6aacd103156891639931d1a442209e
--- regress/lib.sh
+++ regress/lib.sh
@@ -62,7 +62,7 @@ server "localhost" {
 	cert "$PWD/cert.pem"
 	key  "$PWD/key.pem"
 	root "$PWD/testdata"
-	listen on localhost port $port
+	listen on $REGRESS_HOST port $port
 	$2
 }
 EOF
@@ -77,7 +77,7 @@ set_proxy() {
 server "localhost.local" {
 	cert "$PWD/cert.pem"
 	key "$PWD/key.pem"
-	listen on localhost port $port
+	listen on $REGRESS_HOST port $port
 	proxy {
 		relay-to localhost port $port
 		$1
blob - a38e4ba03a75bf901a4ef6e2a48ab9a6e9c64df3
blob + 72509798a9b3e60e6bc53d3ba97c882fe09e4d32
--- regress/tests.sh
+++ regress/tests.sh
@@ -245,7 +245,7 @@ server "localhost" {
 	cert \$pwd "/cert.pem"
 	key  \$pwd "/key.pem"
 	root \$pwd "/testdata"
-	listen on localhost port $port
+	listen on $REGRESS_HOST port $port
 }
 EOF