From 1b457a9e4d5c97e926dbb2c84037904ad33813b9 Mon Sep 17 00:00:00 2001 From: David Horstmann Date: Mon, 4 Nov 2024 15:53:42 +0000 Subject: [PATCH] Undo incorrect path substitution The find and replace of tests/src -> framework/tests/src and tests/include -> framework/tests/include accidentally caused an incorrect path substitution to be performed in tests/Makefile. Undo this change and make the substitution correct again. Signed-off-by: David Horstmann --- tests/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index c0bdeeaf85..c6d8e2ccc3 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -245,10 +245,10 @@ $(BINARIES): %$(EXEXT): %.c $(MBEDLIBS) $(TEST_OBJS_DEPS) $(MBEDTLS_TEST_OBJS) echo " CC $<" $(CC) $(LOCAL_CFLAGS) $(CFLAGS) $< $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ -LOCAL_CRYPTO_CFLAGS = $(patsubst -I./include, -I../../framework/tests/include, $(patsubst -I../%,-I../../%, $(LOCAL_CFLAGS))) +LOCAL_CRYPTO_CFLAGS = $(patsubst -I./include, -I../../tests/include, $(patsubst -I../%,-I../../%, $(LOCAL_CFLAGS))) LOCAL_CRYPTO_LDFLAGS = $(patsubst -L../library, -L../../library, \ $(patsubst -L../tests/%, -L../../tests/%, \ - $(patsubst ./src/%,../../framework/tests/src/%, $(LOCAL_LDFLAGS)))) + $(patsubst ./src/%,../../tests/src/%, $(LOCAL_LDFLAGS)))) $(CRYPTO_BINARIES): %$(EXEXT): %.c $(MBEDLIBS) $(TEST_OBJS_DEPS) $(MBEDTLS_TEST_OBJS) echo " CC $<" cd ../tf-psa-crypto/tests && $(CC) $(LOCAL_CRYPTO_CFLAGS) $(CFLAGS) $(subst $(EXEXT),,$(@F)).c $(LOCAL_CRYPTO_LDFLAGS) $(LDFLAGS) -o $(@F)