Extract compliance-components into a separate file.
Signed-off-by: David Horstmann <david.horstmann@arm.com>
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
diff --git a/tests/scripts/components-compliance.sh b/tests/scripts/components-compliance.sh
index 407a52c..10dd7d5 100644
--- a/tests/scripts/components-compliance.sh
+++ b/tests/scripts/components-compliance.sh
@@ -9,4 +9,24 @@
#### Compliance Testing
################################################################
+component_test_psa_compliance () {
+ # The arch tests build with gcc, so require use of gcc here to link properly
+ msg "build: make, default config (out-of-box), libmbedcrypto.a only"
+ CC=gcc make -C library libmbedcrypto.a
+
+ msg "unit test: test_psa_compliance.py"
+ CC=gcc ./tests/scripts/test_psa_compliance.py
+}
+
+support_test_psa_compliance () {
+ # psa-compliance-tests only supports CMake >= 3.10.0
+ ver="$(cmake --version)"
+ ver="${ver#cmake version }"
+ ver_major="${ver%%.*}"
+
+ ver="${ver#*.}"
+ ver_minor="${ver%%.*}"
+
+ [ "$ver_major" -eq 3 ] && [ "$ver_minor" -ge 10 ]
+}
diff --git a/tests/scripts/components.sh b/tests/scripts/components.sh
index 57d345f..42e516c 100644
--- a/tests/scripts/components.sh
+++ b/tests/scripts/components.sh
@@ -4311,27 +4311,6 @@
make CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/user-config-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess"
}
-component_test_psa_compliance () {
- # The arch tests build with gcc, so require use of gcc here to link properly
- msg "build: make, default config (out-of-box), libmbedcrypto.a only"
- CC=gcc make -C library libmbedcrypto.a
-
- msg "unit test: test_psa_compliance.py"
- CC=gcc ./tests/scripts/test_psa_compliance.py
-}
-
-support_test_psa_compliance () {
- # psa-compliance-tests only supports CMake >= 3.10.0
- ver="$(cmake --version)"
- ver="${ver#cmake version }"
- ver_major="${ver%%.*}"
-
- ver="${ver#*.}"
- ver_minor="${ver%%.*}"
-
- [ "$ver_major" -eq 3 ] && [ "$ver_minor" -ge 10 ]
-}
-
component_test_psasim () {
msg "build server library and application"
scripts/config.py crypto