Make the changes easier to backport

The code replaced in this patch was not compatible with the
development_2.x branch.

Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
This commit is contained in:
Bence Szépkúti 2021-10-25 19:29:07 +02:00
parent 80b31c56eb
commit ca9236b0c5
2 changed files with 11 additions and 6 deletions

View file

@ -2758,15 +2758,21 @@ component_test_zeroize () {
component_test_psa_compliance () { component_test_psa_compliance () {
msg "build: make, default config (out-of-box), libmbedcrypto.a only" msg "build: make, default config (out-of-box), libmbedcrypto.a only"
make library/libmbedcrypto.a make -C library libmbedcrypto.a
msg "unit test: test_psa_compliance.py" msg "unit test: test_psa_compliance.py"
./tests/scripts/test_psa_compliance.py ./tests/scripts/test_psa_compliance.py
} }
support_test_psa_compliance () { support_test_psa_compliance () {
local ver=($(cmake --version | sed 's/cmake version //; y/./ /; q')) ver="$(cmake --version)"
[ "${ver[0]}" -eq 3 ] && [ "${ver[1]}" -ge 10 ] ver="${ver#cmake version }"
ver_major="${ver%%.*}"
ver="${ver#*.}"
ver_minor="${ver%%.*}"
[ "$ver_major" -eq 3 ] && [ "$ver_minor" -ge 10 ]
} }
component_check_python_files () { component_check_python_files () {

View file

@ -16,9 +16,8 @@ PSA_ARCH_TESTS_REF = 'crypto1.0-3.0'
def main(): def main():
mbedtls_dir = os.getcwd() mbedtls_dir = os.getcwd()
mbedcrypto_lib = 'library/libmbedcrypto.a' if not os.path.exists('library/libmbedcrypto.a'):
if not os.path.exists(mbedcrypto_lib): subprocess.check_call(['make', '-C', 'library', 'libmbedcrypto.a'])
subprocess.check_call(['make', mbedcrypto_lib])
psa_arch_tests_dir = 'psa-arch-tests' psa_arch_tests_dir = 'psa-arch-tests'
try: try: