mirror of
https://github.com/Mbed-TLS/mbedtls-framework.git
synced 2026-10-02 06:47:23 +00:00
libtestdriver: Introduce crypto_config_test_driver.
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:
+10
-2
@@ -157,14 +157,22 @@ pre_initialize_variables () {
|
|||||||
CRYPTO_CONFIG_H='tf-psa-crypto/include/psa/crypto_config.h'
|
CRYPTO_CONFIG_H='tf-psa-crypto/include/psa/crypto_config.h'
|
||||||
PSA_CORE_PATH='tf-psa-crypto/core'
|
PSA_CORE_PATH='tf-psa-crypto/core'
|
||||||
BUILTIN_SRC_PATH='tf-psa-crypto/drivers/builtin/src'
|
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
|
else
|
||||||
CRYPTO_CONFIG_H='include/psa/crypto_config.h'
|
CRYPTO_CONFIG_H='include/psa/crypto_config.h'
|
||||||
# helper_armc6_build_test() relies on these being defined,
|
# helper_armc6_build_test() relies on these being defined,
|
||||||
# but empty if the paths don't exist (as in 3.6).
|
# but empty if the paths don't exist (as in 3.6).
|
||||||
PSA_CORE_PATH=''
|
PSA_CORE_PATH=''
|
||||||
BUILTIN_SRC_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
|
fi
|
||||||
config_files="$CONFIG_H $CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H"
|
config_files="$CONFIG_H $CRYPTO_CONFIG_H $CONFIG_TEST_DRIVER_H"
|
||||||
else
|
else
|
||||||
|
|||||||
+10
-2
@@ -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,
|
# 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.
|
# otherwise we will end up running multithreaded tests without mutexes to protect them.
|
||||||
if scripts/config.py get MBEDTLS_THREADING_C; then
|
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
|
fi
|
||||||
|
|
||||||
if scripts/config.py get MBEDTLS_THREADING_PTHREAD; then
|
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
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user