Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-07-28 06:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

libtestdriver: Introduce crypto_config_test_driver.

Browse Source 
tf-psa configuration options for the libtestdriver
have been migrated to `crypto_config_test_driver.h`

Signed-off-by: Minos Galanakis <[email protected]>
This commit is contained in:
Minos Galanakis
2024-11-29 14:39:07 +00:00
parent df0144c4a3
commit dbe4be448f
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/all-core.sh
+10 -2
View File
@@ -157,14 +157,22 @@ pre_initialize_variables () {
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'
CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/config_test_driver.h'
if in_3_6_branch; then
CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/config_test_driver.h'
else
CONFIG_TEST_DRIVER_H='tf-psa-crypto/tests/configs/crypto_config_test_driver.h'
fi
else
CRYPTO_CONFIG_H='include/psa/crypto_config.h'
# helper_armc6_build_test() relies on these being defined,
# but empty if the paths don't exist (as in 3.6).
PSA_CORE_PATH=''
BUILTIN_SRC_PATH=''
CONFIG_TEST_DRIVER_H='tests/configs/config_test_driver.h'
if in_3_6_branch; then
CONFIG_TEST_DRIVER_H='tests/configs/config_test_driver.h'
else
CONFIG_TEST_DRIVER_H='tests/configs/crypto_config_test_driver.h'
fi
fi
config_files="$CONFIG_H $CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H"
else
scripts/all-helpers.sh
+10 -2
View File
@@ -80,11 +80,19 @@ helper_libtestdriver1_adjust_config() {
# If threading is enabled on the normal build, then we need to enable it in the drivers as well,
# otherwise we will end up running multithreaded tests without mutexes to protect them.
if scripts/config.py get MBEDTLS_THREADING_C; then
scripts/config.py -f "$CONFIG_TEST_DRIVER_H" set MBEDTLS_THREADING_C
if in_3_6_branch; then
scripts/config.py -f "$CONFIG_TEST_DRIVER_H" set MBEDTLS_THREADING_C
else
scripts/config.py -c "$CONFIG_TEST_DRIVER_H" set MBEDTLS_THREADING_C
fi
fi
if scripts/config.py get MBEDTLS_THREADING_PTHREAD; then
scripts/config.py -f "$CONFIG_TEST_DRIVER_H" set MBEDTLS_THREADING_PTHREAD
if in_3_6_branch; then
scripts/config.py -f "$CONFIG_TEST_DRIVER_H" set MBEDTLS_THREADING_PTHREAD
else
scripts/config.py -c "$CONFIG_TEST_DRIVER_H" set MBEDTLS_THREADING_PTHREAD
fi
fi
}