From 09b179b67c95232cb00dc9d6e0a0c80c04383129 Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Fri, 26 Jul 2024 15:47:17 +0100 Subject: [PATCH] Extract configuration-x509 components into a separate file. Signed-off-by: David Horstmann Signed-off-by: Thomas Daubney Signed-off-by: Minos Galanakis --- tests/scripts/components-configuration-x509.sh | 13 +++++++++++++ tests/scripts/components.sh | 14 -------------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tests/scripts/components-configuration-x509.sh b/tests/scripts/components-configuration-x509.sh index 8a6fd6b904..6cf39348f1 100644 --- a/tests/scripts/components-configuration-x509.sh +++ b/tests/scripts/components-configuration-x509.sh @@ -9,4 +9,17 @@ #### Configuration Testing - X509 ################################################################ +component_test_no_x509_info () { + msg "build: full + MBEDTLS_X509_REMOVE_INFO" # ~ 10s + scripts/config.pl full + scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests + scripts/config.pl set MBEDTLS_X509_REMOVE_INFO + make CFLAGS='-Werror -O2' + + msg "test: full + MBEDTLS_X509_REMOVE_INFO" # ~ 10s + make test + + msg "test: ssl-opt.sh, full + MBEDTLS_X509_REMOVE_INFO" # ~ 1 min + tests/ssl-opt.sh +} diff --git a/tests/scripts/components.sh b/tests/scripts/components.sh index a42ee6e8af..9b215a7f3b 100644 --- a/tests/scripts/components.sh +++ b/tests/scripts/components.sh @@ -686,20 +686,6 @@ support_test_mx32 () { esac } -component_test_no_x509_info () { - msg "build: full + MBEDTLS_X509_REMOVE_INFO" # ~ 10s - scripts/config.pl full - scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests - scripts/config.pl set MBEDTLS_X509_REMOVE_INFO - make CFLAGS='-Werror -O2' - - msg "test: full + MBEDTLS_X509_REMOVE_INFO" # ~ 10s - make test - - msg "test: ssl-opt.sh, full + MBEDTLS_X509_REMOVE_INFO" # ~ 1 min - tests/ssl-opt.sh -} - component_test_memsan () { msg "build: MSan (clang)" # ~ 1 min 20s scripts/config.py unset MBEDTLS_AESNI_C # memsan doesn't grok asm