From bced0c782ddd934ced88d340a63aa30a310916b3 Mon Sep 17 00:00:00 2001
From: Ronald Cron <ronald.cron@arm.com>
Date: Mon, 9 Dec 2024 17:58:04 +0100
Subject: [PATCH] Fix check that psa_test_wrappers.[hc] are up to date
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
---
framework | 2 +-
tests/scripts/check-generated-files.sh | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/framework b/framework
index 4d16e0c3a6..8e3b171218 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 4d16e0c3a64e16422f1991f4c28eba4de9318dfc
+Subproject commit 8e3b1712182b0d5f52226570877fb62d5605aec0
diff --git a/tests/scripts/check-generated-files.sh b/tests/scripts/check-generated-files.sh
index 5c62b4f802..3b186d68a6 100755
--- a/tests/scripts/check-generated-files.sh
+++ b/tests/scripts/check-generated-files.sh
@@ -146,6 +146,10 @@ if [ -d tf-psa-crypto ]; then
check ../framework/scripts/generate_ecp_tests.py $(../framework/scripts/generate_ecp_tests.py --list)
check ../framework/scripts/generate_psa_tests.py $(../framework/scripts/generate_psa_tests.py --list)
cd ..
+ # Generated files that are present in the repository even in the development
+ # branch. (This is intended to be temporary, until the generator scripts are
+ # fully reviewed and the build scripts support a generated header file.)
+ check framework/scripts/generate_psa_wrappers.py tf-psa-crypto/tests/include/test/psa_test_wrappers.h tf-psa-crypto/tests/src/psa_test_wrappers.c
check tf-psa-crypto/scripts/generate_driver_wrappers.py ${crypto_core_dir}/psa_crypto_driver_wrappers.h \
${crypto_core_dir}/psa_crypto_driver_wrappers_no_static.c
check framework/scripts/generate_config_tests.py tests/suites/test_suite_config.mbedtls_boolean.data
@@ -161,6 +165,10 @@ else
check framework/scripts/generate_psa_tests.py $(framework/scripts/generate_psa_tests.py --list)
check scripts/generate_driver_wrappers.py ${crypto_core_dir}/psa_crypto_driver_wrappers.h \
${crypto_core_dir}/psa_crypto_driver_wrappers_no_static.c
+ # Generated files that are present in the repository even in the development
+ # branch. (This is intended to be temporary, until the generator scripts are
+ # fully reviewed and the build scripts support a generated header file.)
+ check framework/scripts/generate_psa_wrappers.py tests/include/test/psa_test_wrappers.h tests/src/psa_test_wrappers.c
fi
check framework/scripts/generate_test_keys.py framework/tests/include/test/test_keys.h
@@ -178,8 +186,3 @@ if in_mbedtls_repo; then
# the step that creates or updates these files.
check scripts/generate_visualc_files.pl visualc/VS2017
fi
-
-# Generated files that are present in the repository even in the development
-# branch. (This is intended to be temporary, until the generator scripts are
-# fully reviewed and the build scripts support a generated header file.)
-check framework/scripts/generate_psa_wrappers.py tf-psa-crypto/tests/include/test/psa_test_wrappers.h tf-psa-crypto/tests/src/psa_test_wrappers.c