From 27a1ac740960c936e533a933684969dc10cc2555 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Thu, 12 Dec 2024 11:04:03 +0100 Subject: [PATCH] make: Generate test_keys.h in tf-psa-crypto/framework as well Signed-off-by: Ronald Cron --- tests/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 9254da00f..e13eb50c7 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -57,7 +57,9 @@ endif GENERATED_CRYPTO_DATA_FILES += $(GENERATED_PSA_DATA_FILES) GENERATED_FILES = $(GENERATED_DATA_FILES) $(GENERATED_CRYPTO_DATA_FILES) -GENERATED_FILES += ../framework/tests/include/test/test_keys.h src/test_certs.h +GENERATED_FILES += ../framework/tests/include/test/test_keys.h \ + ../tf-psa-crypto/framework/tests/include/test/test_keys.h \ + src/test_certs.h # Generated files needed to (fully) run ssl-opt.sh .PHONY: ssl-opt @@ -176,6 +178,10 @@ src/test_certs.h: ../framework/scripts/generate_test_cert_macros.py \ echo " Gen $@" $(PYTHON) ../framework/scripts/generate_test_keys.py --output $@ +../tf-psa-crypto/framework/tests/include/test/test_keys.h: ../tf-psa-crypto/framework/scripts/generate_test_keys.py + echo " Gen $@" + $(PYTHON) ../tf-psa-crypto/framework/scripts/generate_test_keys.py --output $@ + TEST_OBJS_DEPS = $(wildcard include/test/*.h include/test/*/*.h) ifdef RECORD_PSA_STATUS_COVERAGE_LOG # Explicitly depend on this header because on a clean copy of the source tree, @@ -183,7 +189,8 @@ ifdef RECORD_PSA_STATUS_COVERAGE_LOG # therefore the wildcard enumeration above doesn't include it. TEST_OBJS_DEPS += ../framework/tests/include/test/instrument_record_status.h endif -TEST_OBJS_DEPS += src/test_certs.h ../framework/tests/include/test/test_keys.h +TEST_OBJS_DEPS += src/test_certs.h ../framework/tests/include/test/test_keys.h \ + ../tf-psa-crypto/framework/tests/include/test/test_keys.h # Rule to compile common test C files in framework ../framework/tests/src/%.o : ../framework/tests/src/%.c $(TEST_OBJS_DEPS)