Extract configuration-x509 components into a separate file.
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
diff --git a/tests/scripts/components-configuration-x509.sh b/tests/scripts/components-configuration-x509.sh
index 2bf5789..e8ef283 100644
--- a/tests/scripts/components-configuration-x509.sh
+++ b/tests/scripts/components-configuration-x509.sh
@@ -8,3 +8,28 @@
################################################################
#### 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
+}
+
+component_test_sw_inet_pton () {
+ msg "build: default plus MBEDTLS_TEST_SW_INET_PTON"
+
+ # MBEDTLS_TEST_HOOKS required for x509_crt_parse_cn_inet_pton
+ scripts/config.py set MBEDTLS_TEST_HOOKS
+ make CFLAGS="-DMBEDTLS_TEST_SW_INET_PTON"
+
+ msg "test: default plus MBEDTLS_TEST_SW_INET_PTON"
+ make test
+}
diff --git a/tests/scripts/components.sh b/tests/scripts/components.sh
index 5528e4b..37631cb 100644
--- a/tests/scripts/components.sh
+++ b/tests/scripts/components.sh
@@ -267,17 +267,6 @@
tests/scripts/test-ref-configs.pl
}
-component_test_sw_inet_pton () {
- msg "build: default plus MBEDTLS_TEST_SW_INET_PTON"
-
- # MBEDTLS_TEST_HOOKS required for x509_crt_parse_cn_inet_pton
- scripts/config.py set MBEDTLS_TEST_HOOKS
- make CFLAGS="-DMBEDTLS_TEST_SW_INET_PTON"
-
- msg "test: default plus MBEDTLS_TEST_SW_INET_PTON"
- make test
-}
-
component_test_full_no_cipher_no_psa_crypto () {
msg "build: full no CIPHER no PSA_CRYPTO_C"
scripts/config.py full
@@ -1518,20 +1507,6 @@
make test
}
-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_build_arm_none_eabi_gcc () {
msg "build: ${ARM_NONE_EABI_GCC_PREFIX}gcc -O1, baremetal+debug" # ~ 10s
scripts/config.py baremetal