From b76606cc142aa5fc8d57f15b938cf598d52da126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 17 Apr 2024 12:15:51 +0200 Subject: [PATCH] Run full compat.sh in ASan component only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It makes little sense to run full compat.sh in the non-ASan component but only partial compat.sh in the ASan component. Actually, the non-ASan component doesn't need compat.sh at all, it's more than covered with ssl-opt.sh and test_suite_ssl already. Signed-off-by: Manuel Pégourié-Gonnard --- tests/scripts/all.sh | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index e06e9434cc..21c8680500 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -928,8 +928,18 @@ component_test_full_cmake_gcc_asan () { 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 all except legacy/next (full config, ASan build)" + tests/compat.sh -e '^DES-CBC-\|-DES-CBC-\|ARIA\|CHACHA' \ + -m 'ssl3 tls1 tls1_1 tls12 dtls1 dtls12' + + msg "test: compat.sh single-DES (full config, ASan build)" + env OPENSSL="$OPENSSL_LEGACY" tests/compat.sh -e '^$' -f '^DES-CBC\|-DES-CBC-' \ + -m 'ssl3 tls1 tls1_1 tls12 dtls1 dtls12' + + # ARIA and ChachaPoly are both (D)TLS 1.2 only + msg "test: compat.sh ARIA + ChachaPoly (full config, ASan build)" + env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA' \ + -m 'dtls12 dtls12' msg "test: context-info.sh (full config, ASan build)" # ~ 15 sec tests/context-info.sh @@ -1628,19 +1638,6 @@ component_test_full_cmake_clang () { 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 all except legacy/next (full config)" - tests/compat.sh -e '^DES-CBC-\|-DES-CBC-\|ARIA\|CHACHA' \ - -m 'ssl3 tls1 tls1_1 tls12 dtls1 dtls12' - - msg "test: compat.sh single-DES (full config)" - env OPENSSL="$OPENSSL_LEGACY" tests/compat.sh -e '^$' -f '^DES-CBC\|-DES-CBC-' \ - -m 'ssl3 tls1 tls1_1 tls12 dtls1 dtls12' - - # ARIA and ChachaPoly are both (D)TLS 1.2 only - msg "test: compat.sh ARIA + ChachaPoly (full config)" - env OPENSSL="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA' \ - -m 'dtls12 dtls12' } skip_suites_without_constant_flow () {