From: Daiki Ueno <ueno@gnu.org>
Date: Fri, 7 Jul 2023 11:18:20 +0000 (+0200)
Subject: tests: make testcompat-openssl-tls13-serv.sh less flaky
X-Git-Tag: 3.8.1~12^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd70528485e64ee10c1dcbfe8f6517c3bd05948c;p=thirdparty%2Fgnutls.git

tests: make testcompat-openssl-tls13-serv.sh less flaky

Bash has a special variable GROUPS[1] which clashes with our use in
testcompat-openssl-tls13-serv.sh as a list of key exchange groups.
This avoids using it as well as expands the logging message to
indicate what is tested.

1. https://www.gnu.org/software/bash/manual/html_node/Bash-Variables.html#index-GROUPS

Signed-off-by: Daiki Ueno <ueno@gnu.org>
---

diff --git a/tests/suite/testcompat-openssl-tls13-serv.sh b/tests/suite/testcompat-openssl-tls13-serv.sh
index fdabc4e515..7368ffc7d8 100755
--- a/tests/suite/testcompat-openssl-tls13-serv.sh
+++ b/tests/suite/testcompat-openssl-tls13-serv.sh
@@ -90,7 +90,7 @@ fi
 
 #AES-128-CCM
 for i in AES-128-GCM AES-256-GCM CHACHA20-POLY1305 AES-128-CCM AES-128-CCM-8;do
-	echo_cmd "${PREFIX}Checking TLS 1.3 with ${i}..."
+	echo_cmd "${PREFIX}Checking TLS 1.3 with cipher ${i}..."
 
 	eval "${GETPORT}"
 	launch_server --priority "NORMAL:-VERS-ALL:+VERS-TLS1.3:-CIPHER-ALL:+${i}${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}" >>${OUTPUT} 2>&1
@@ -104,9 +104,8 @@ for i in AES-128-GCM AES-256-GCM CHACHA20-POLY1305 AES-128-CCM AES-128-CCM-8;do
 	wait
 done
 
-GROUPS="GROUP-X25519 GROUP-X448 GROUP-SECP256R1 GROUP-SECP384R1 GROUP-SECP521R1"
-for i in $GROUPS;do
-	echo_cmd "${PREFIX}Checking TLS 1.3 with ${i}..."
+for i in GROUP-X25519 GROUP-X448 GROUP-SECP256R1 GROUP-SECP384R1 GROUP-SECP521R1;do
+	echo_cmd "${PREFIX}Checking TLS 1.3 with group ${i}..."
 
 	eval "${GETPORT}"
 	launch_server --priority "NORMAL:-VERS-ALL:+VERS-TLS1.3:-GROUP-ALL:+${i}${ADD}" --x509certfile "${SERV_CERT}" --x509keyfile "${SERV_KEY}" --x509cafile "${CA_CERT}"  >>${OUTPUT} 2>&1