From dc45951cf6f6e5c636b7ed08bf6d9537a5039c39 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Thu, 7 Nov 2024 17:08:11 +0000 Subject: [PATCH] Update path to PSA crypto alt headers Signed-off-by: David Horstmann --- tests/Makefile | 8 ++++---- tests/scripts/components-configuration-crypto.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index d27b29f66e..45dc80205a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -268,7 +268,7 @@ ifndef WINDOWS rm -f src/*.o src/test_helpers/*.o src/libmbed* rm -f ../framework/tests/src/*.o ../framework/tests/src/drivers/*.o rm -f include/test/instrument_record_status.h - rm -f include/alt-extra/*/*_alt.h + rm -f ../framework/tests/include/alt-extra/*/*_alt.h rm -rf libtestdriver1 rm -rf libpsaclient libpsaserver rm -f ../library/libtestdriver1.a @@ -294,11 +294,11 @@ check: $(BINARIES) $(CRYPTO_BINARIES) test: check # Generate variants of some headers for testing -include/alt-extra/%_alt.h: ../include/%.h +../framework/tests/include/alt-extra/%_alt.h: ../include/%.h perl -p -e 's/^(# *(define|ifndef) +\w+_)H\b/$${1}ALT_H/' $< >$@ -include/alt-extra/%_alt.h: ../tf-psa-crypto/include/%.h +../framework/tests/include/alt-extra/%_alt.h: ../tf-psa-crypto/include/%.h perl -p -e 's/^(# *(define|ifndef) +\w+_)H\b/$${1}ALT_H/' $< >$@ -include/alt-extra/%_alt.h: ../tf-psa-crypto/drivers/builtin/include/%.h +../framework/tests/include/alt-extra/%_alt.h: ../tf-psa-crypto/drivers/builtin/include/%.h perl -p -e 's/^(# *(define|ifndef) +\w+_)H\b/$${1}ALT_H/' $< >$@ # Generate test library diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh index b524102070..2c83caf07f 100644 --- a/tests/scripts/components-configuration-crypto.sh +++ b/tests/scripts/components-configuration-crypto.sh @@ -2685,7 +2685,7 @@ component_build_psa_alt_headers () { # Generate alternative versions of the substitutable headers with the # same content except different include guards. - make -C tests include/alt-extra/psa/crypto_platform_alt.h include/alt-extra/psa/crypto_struct_alt.h + make -C tests ../framework/tests/include/alt-extra/psa/crypto_platform_alt.h ../framework/tests/include/alt-extra/psa/crypto_struct_alt.h # Build the library and some programs. # Don't build the fuzzers to avoid having to go through hoops to set