diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-07 10:21:51 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-07 10:22:18 +0200 |
commit | c27376064181a17811d23b5647d98d5656d8813e (patch) | |
tree | 343c2649f09fbdf871031f9f77365d4c9e0cc455 | |
parent | 805f14d44805ec8070334e24ad87539d5f0b33dd (diff) | |
download | gnutls-c27376064181a17811d23b5647d98d5656d8813e.tar.gz |
tests: tls-fuzzer-alpn: operate on random port
This allows parallel run of the test with other tlsfuzzer tests.
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r-- | tests/suite/tls-fuzzer/gnutls-alpn.json | 5 | ||||
-rwxr-xr-x | tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh | 6 | ||||
-rwxr-xr-x | tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/tests/suite/tls-fuzzer/gnutls-alpn.json b/tests/suite/tls-fuzzer/gnutls-alpn.json index e6da53d51e..b02f07305e 100644 --- a/tests/suite/tls-fuzzer/gnutls-alpn.json +++ b/tests/suite/tls-fuzzer/gnutls-alpn.json @@ -8,13 +8,16 @@ "--alpn-fatal", "--priority=@PRIORITY@", "--disable-client-cert", "--port=@PORT@"], + "server_hostname": "localhost", + "server_port": @PORT@, "tests" : [ {"name" : "test-alpn-negotiation.py", "comment" : "we do not not fail when ALPN name changes on resumption", "comment" : "we do not not parse all objects when a match is found", "arguments" : ["-e", "overflow length of last item", "-e", "resumption with alpn change", - "-e", "underflow length of protocol_name_list"]} + "-e", "underflow length of protocol_name_list", + "-p", "@PORT@"]} ] } ] diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh b/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh index ba4a529c8f..80ebfc57b1 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-alpn.sh @@ -27,10 +27,7 @@ TMPFILE=tls-fuzzer.$$.tmp . "${srcdir}/../scripts/common.sh" -#eval "${GETPORT}" -PORT=4433 - -$LOCKFILE +eval "${GETPORT}" pushd tls-fuzzer @@ -67,5 +64,4 @@ rm -f ${TMPFILE} popd popd -$UNLOCKFILE exit $retval diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh index 53759db477..3a46cdb735 100755 --- a/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh +++ b/tests/suite/tls-fuzzer/tls-fuzzer-nocert-tls13.sh @@ -27,7 +27,6 @@ TMPFILE=tls-fuzzer.$$.tmp . "${srcdir}/../scripts/common.sh" -# We hard-code the port because of limitations in tlsfuzzer eval "${GETPORT}" pushd tls-fuzzer |