commit d9ad663ceafe2553183660a7ca2c0e30d28cdafe
author David Horstmann <david.horstmann@arm.com> Tue Nov 05 14:40:03 2024 +0000
committer David Horstmann <david.horstmann@arm.com> Mon Nov 18 15:50:44 2024 +0000
tree 38f2ff558e92dffe2713d2f39310e8e7ccfd700d
parent bc06e2acb5c4a9f443f8014e363eb1a545d19a38

Update common.mk with test helper object paths

Signed-off-by: David Horstmann <david.horstmann@arm.com>

scripts/common.make

diff --git a/scripts/common.make b/scripts/common.make
index 906b8ac..b3d028f 100644
--- a/scripts/common.make
+++ b/scripts/common.make
@@ -151,18 +151,19 @@
 
 # Auxiliary modules used by tests and some sample programs
 MBEDTLS_CORE_TEST_OBJS := $(patsubst %.c,%.o,$(wildcard \
-    ${MBEDTLS_TEST_PATH}/src/*.c \
-    ${MBEDTLS_TEST_PATH}/src/drivers/*.c \
+    ${MBEDTLS_PATH}/framework/tests/src/*.c \
+    ${MBEDTLS_PATH}/framework/tests/src/drivers/*.c \
   ))
 # Ignore PSA stubs when building for the client side of PSASIM (i.e.
 # CRYPTO_CLIENT && !CRYPTO_C) otherwise there will be functions duplicates.
 ifdef PSASIM
 MBEDTLS_CORE_TEST_OBJS := $(filter-out \
-    ${MBEDTLS_TEST_PATH}/src/psa_crypto_stubs.o, $(MBEDTLS_CORE_TEST_OBJS)\
+    ${MBEDTLS_PATH}/framework/tests/src/psa_crypto_stubs.o, $(MBEDTLS_CORE_TEST_OBJS)\
   )
 endif
 # Additional auxiliary modules for TLS testing
 MBEDTLS_TLS_TEST_OBJS = $(patsubst %.c,%.o,$(wildcard \
+    ${MBEDTLS_TEST_PATH}/src/*.c \
     ${MBEDTLS_TEST_PATH}/src/test_helpers/*.c \
   ))