cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-09-30 00:46:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

all.sh: Move definitions of PSA core and builtin source paths

Browse Source 
Move the definitions of PSA core and builtin
source paths to pre_initialize_variables
where they are merged with the definition
of the configuration file paths.

Add the 3.6 case by the way as
pre_initialize_variables is planned to
be in the all.sh part that will land in
mbedtls-framework at some point.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2024-07-04 09:25:59 +02:00
parent bdd8df852f
commit 9027955afc
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/scripts/all.sh
View File

@ -133,10 +133,18 @@ pre_check_environment () {
pre_initialize_variables () { pre_initialize_variables () {
if in_mbedtls_repo; then if in_mbedtls_repo; then
CONFIG_H='include/mbedtls/mbedtls_config.h' CONFIG_H='include/mbedtls/mbedtls_config.h'
CRYPTO_CONFIG_H='tf-psa-crypto/include/psa/crypto_config.h' if [ -d tf-psa-crypto ]; then
CRYPTO_CONFIG_H='tf-psa-crypto/include/psa/crypto_config.h'
PSA_CORE_PATH='tf-psa-crypto/core'
BUILTIN_SRC_PATH='tf-psa-crypto/drivers/builtin/src'
else
CRYPTO_CONFIG_H='include/psa/crypto_config.h'
fi
else else
CONFIG_H='drivers/builtin/include/mbedtls/mbedtls_config.h' CONFIG_H='drivers/builtin/include/mbedtls/mbedtls_config.h'
CRYPTO_CONFIG_H='include/psa/crypto_config.h' CRYPTO_CONFIG_H='include/psa/crypto_config.h'
PSA_CORE_PATH='core'
BUILTIN_SRC_PATH='drivers/builtin/src'
fi fi
CONFIG_TEST_DRIVER_H='tests/include/test/drivers/config_test_driver.h' CONFIG_TEST_DRIVER_H='tests/include/test/drivers/config_test_driver.h'
@ -449,8 +457,12 @@ armc6_build_test()
msg "size: ARM Compiler 6 ($FLAGS)" msg "size: ARM Compiler 6 ($FLAGS)"
"$ARMC6_FROMELF" -z library/*.o "$ARMC6_FROMELF" -z library/*.o
"$ARMC6_FROMELF" -z ${PSA_CORE_PATH}/*.o if [ -n ${PSA_CORE_PATH} ]; then
"$ARMC6_FROMELF" -z ${BUILTIN_SRC_PATH}/*.o "$ARMC6_FROMELF" -z ${PSA_CORE_PATH}/*.o
fi
if [ -n ${BUILTIN_SRC_PATH} ]; then
"$ARMC6_FROMELF" -z ${BUILTIN_SRC_PATH}/*.o
fi
} }
err_msg() err_msg()
@ -1101,9 +1113,6 @@ helper_psasim_server() {
#### Basic checks #### Basic checks
################################################################ ################################################################
export PSA_CORE_PATH="tf-psa-crypto/core"
export BUILTIN_SRC_PATH="tf-psa-crypto/drivers/builtin/src"
# #
# Test Suites to be executed # Test Suites to be executed
# #