summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2018-06-12 15:48:47 +0200
committerDaniel Stenberg <daniel@haxx.se>2018-06-12 16:11:21 +0200
commitbb9a340c73f3f96b2a8e39add7072aae4dc81628 (patch)
tree30ead446b9e586ca0607ae22317695c18e0c9343
parent5ae22272d1506e5c0e431f4ad60f1dc446f76715 (diff)
downloadcurl-bb9a340c73f3f96b2a8e39add7072aae4dc81628.tar.gz
runtests: support variables in <strippart>
... and make use of that to make 1455 work better without using a fixed local port number. Fixes #2649 Closes #2650
-rw-r--r--tests/data/test14557
-rwxr-xr-xtests/runtests.pl2
2 files changed, 7 insertions, 2 deletions
diff --git a/tests/data/test1455 b/tests/data/test1455
index 7768a1f89..0b77dc4f5 100644
--- a/tests/data/test1455
+++ b/tests/data/test1455
@@ -35,7 +35,7 @@ http
HTTP GET when PROXY Protocol enabled
</name>
<command>
-http://%HOSTIP:%HTTPPORT/1455 --haproxy-protocol --local-port 37756
+http://%HOSTIP:%HTTPPORT/1455 --haproxy-protocol
</command>
</client>
@@ -45,8 +45,11 @@ http://%HOSTIP:%HTTPPORT/1455 --haproxy-protocol --local-port 37756
<strip>
^User-Agent:.*
</strip>
+<strippart>
+s/^PROXY TCP4 %CLIENTIP %HOSTIP (\d*) %HTTPPORT/proxy-line/
+</strippart>
<protocol>
-PROXY TCP4 %CLIENTIP %HOSTIP 37756 %HTTPPORT
+proxy-line
GET /1455 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 054c64bf3..92fb447a2 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -4349,9 +4349,11 @@ sub singletest {
# what parts to cut off from the protocol
my @strippart = getpart("verify", "strippart");
my $strip;
+ @strippart = fixarray(@strippart);
for $strip (@strippart) {
chomp $strip;
for(@out) {
+ print STDERR ":::: $strip\n";
eval $strip;
}
}