commit 5a454f7781a36dbf9c34eeaf1db892184a7496ad
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Nov 25 11:25:08 2022 +0100
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Fri Nov 25 11:48:17 2022 +0100
tree e2f275a6509d81790152169903cdee91d14e6c79
parent 61336848a922d29e45b06e79e3058be2a1a5a1b5

Remove redundant tests in ssl-opt.sh

We don't need to have two copies of the test with one of them depending
on legacy/compat CID: we can have just one copy, but make sure we run
ssl-opt.sh both in a build with standard CID and in a build with
legacy/compat - that's the job of all.sh (see next commit).

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index cc0ac55..de94983 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -525,14 +525,6 @@
     requires_config_value_at_least "MBEDTLS_SSL_OUT_CONTENT_LEN" $1
 }
 
-CID_MODE=$( get_config_value_or_default "MBEDTLS_SSL_DTLS_CONNECTION_ID_COMPAT" )
-
-requires_cid_compat() {
-    if [ "$CID_MODE" = "0" ]; then
-        SKIP_NEXT="YES"
-    fi
-}
-
 # skip next test if GnuTLS isn't available
 requires_gnutls() {
     if [ -z "${GNUTLS_AVAILABLE:-}" ]; then
@@ -2616,16 +2608,6 @@
             -C "Deserializing connection..." \
             -s "Deserializing connection..."
 
-requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
-requires_config_enabled MBEDTLS_SSL_DTLS_CONNECTION_ID
-requires_cid_compat
-run_test    "Context serialization, server serializes, with CID (legacy)" \
-            "$P_SRV dtls=1 serialize=1 exchanges=2 cid=1 cid_val=dead" \
-            "$P_CLI dtls=1 serialize=0 exchanges=2 cid=1 cid_val=beef" \
-            0 \
-            -C "Deserializing connection..." \
-            -s "Deserializing connection..."
-
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
 requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
 run_test    "Context serialization, both serialize, CCM" \
@@ -2663,18 +2645,6 @@
             -c "Deserializing connection..." \
             -s "Deserializing connection..."
 
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
-requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
-requires_config_enabled MBEDTLS_SSL_DTLS_CONNECTION_ID
-requires_cid_compat
-run_test    "Context serialization, both serialize, with CID (legacy)" \
-            "$P_SRV dtls=1 serialize=1 exchanges=2 cid=1 cid_val=dead" \
-            "$P_CLI dtls=1 serialize=1 exchanges=2 cid=1 cid_val=beef" \
-            0 \
-            -c "Deserializing connection..." \
-            -s "Deserializing connection..."
-
-
 requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
 run_test    "Context serialization, re-init, client serializes, CCM" \
             "$P_SRV dtls=1 serialize=0 exchanges=2" \
@@ -2711,17 +2681,6 @@
             -c "Deserializing connection..." \
             -S "Deserializing connection..."
 
-requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_2
-requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
-requires_config_enabled MBEDTLS_SSL_DTLS_CONNECTION_ID
-requires_cid_compat
-run_test    "Context serialization, re-init, client serializes, with CID (legacy)" \
-            "$P_SRV dtls=1 serialize=0 exchanges=2 cid=1 cid_val=dead" \
-            "$P_CLI dtls=1 serialize=2 exchanges=2 cid=1 cid_val=beef" \
-            0 \
-            -c "Deserializing connection..." \
-            -S "Deserializing connection..."
-
 requires_config_enabled MBEDTLS_SSL_CONTEXT_SERIALIZATION
 run_test    "Context serialization, re-init, server serializes, CCM" \
             "$P_SRV dtls=1 serialize=2 exchanges=2" \