Simplify full invocation of compat.sh
We actually only need two invocations.
This also moves all the default tests to OPENSSL_NEXT, which is good
because OPENSSL is ancient.
I have no idea why NULL doesn't work with OPENSSL_NEXT (1.1.1a) server,
because according to the manpage [1], "ALL,COMPLEMENTOFALL" (which is
what we are using) should do it, and indeed
$OPENSSL_NEXT ciphers "ALL,COMPLEMENTOFALL" | tr ':' '\n'
lists NULL ciphersuites, and also they work client-side with
OPENSSL_NEXT...
[1] https://www.openssl.org/docs/man1.1.1/man1/ciphers.html
Also, while at it, remove partial invocation (only non-default) from one
component, as we already have a full invocation in the same config (plus
ASan) in another component.
Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 3aabec4..3f7ad95 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1218,8 +1218,11 @@
msg "test: ssl-opt.sh (full config, ASan build)"
tests/ssl-opt.sh
- msg "test: compat.sh (full config, ASan build)"
- tests/compat.sh
+ msg "test: compat.sh: NULL (full config, ASan build)"
+ tests/compat.sh -f 'NULL'
+
+ msg "test: compat.sh next: all except NULL (full config, ASan build)"
+ env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e 'NULL'
msg "test: context-info.sh (full config, ASan build)" # ~ 15 sec
tests/context-info.sh
@@ -1242,8 +1245,11 @@
msg "test: ssl-opt.sh (full config, ASan build)"
tests/ssl-opt.sh
- msg "test: compat.sh (full config, ASan build)"
- tests/compat.sh
+ msg "test: compat.sh: NULL (full config, ASan build)"
+ tests/compat.sh -f 'NULL'
+
+ msg "test: compat.sh next: all except NULL (full config, ASan build)"
+ env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e 'NULL'
msg "test: context-info.sh (full config, ASan build)" # ~ 15 sec
tests/context-info.sh
@@ -2161,12 +2167,6 @@
msg "test: ssl-opt.sh default, ECJPAKE, SSL async (full config)" # ~ 1s
tests/ssl-opt.sh -f 'Default\|ECJPAKE\|SSL async private'
-
- msg "test: compat.sh NULL (full config)" # ~ 2 min
- tests/compat.sh -e '^$' -f 'NULL'
-
- msg "test: compat.sh ARIA + ChachaPoly"
- env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA'
}
skip_suites_without_constant_flow () {
@@ -2610,14 +2610,11 @@
msg "test: ssl-opt.sh (full minus PSA crypto)"
tests/ssl-opt.sh
- msg "test: compat.sh default (full minus PSA crypto)"
- tests/compat.sh
-
- msg "test: compat.sh NULL (full minus PSA crypto)"
+ msg "test: compat.sh: NULL (full minus PSA crypto)"
tests/compat.sh -f 'NULL'
- msg "test: compat.sh ARIA + ChachaPoly (full minus PSA crypto)"
- env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA'
+ msg "test: compat.sh next: all except NULL (full minus PSA crypto)"
+ env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e 'NULL'
}
component_test_psa_crypto_config_accel_ecdsa () {
diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh
index 5261754..e365eed 100755
--- a/tests/scripts/basic-build-test.sh
+++ b/tests/scripts/basic-build-test.sh
@@ -102,16 +102,12 @@
# Step 2c - Compatibility tests (keep going even if some tests fail)
echo '################ compat.sh ################'
{
- echo '#### compat.sh: Default versions'
- sh compat.sh
- echo
-
- echo '#### compat.sh: null cipher'
+ echo '#### compat.sh: NULL ciphersuites'
sh compat.sh -e '^$' -f 'NULL'
echo
- echo '#### compat.sh: next (ARIA, ChaCha)'
- OPENSSL="$OPENSSL_NEXT" sh compat.sh -e '^$' -f 'ARIA\|CHACHA'
+ echo '#### compat.sh: next (all except NULL)'
+ OPENSSL="$OPENSSL_NEXT" sh compat.sh -e 'NULL'
echo
} | tee compat-test-$TEST_OUTPUT
echo '^^^^^^^^^^^^^^^^ compat.sh ^^^^^^^^^^^^^^^^'