From c9d0c97a9fa59ff1ab113e5d56753a1c666e33d5 Mon Sep 17 00:00:00 2001 From: Craig Hesling Date: Thu, 6 Oct 2022 20:51:23 -0400 Subject: third_party: Fix print-tests for cryptoc users The use of this variable collides with another use of the variable. Since cryptoc was introduced, the print-tests target wouldn't work correctly for boards that used cryptoc. Instead of printing the test target symbolic name, it would print the full path to all test executable targets. BRANCH=none BUG=b:169156874,b:236389226,b:176500425 TEST=make BOARD=bloonchipper print-tests # Check that the full path isn't shown TEST=make BOARD=bloonchipper tests # Ensure that cryptoc is being built for tests TEST=make host-fp # Ensure cryptoc is being built TEST=make BOARD=bloonchipper # Ensure cryptoc is being built TEST=./util/compare_build.sh -bfp # verdict was match Change-Id: Ia0c0aa9b57c224395df6e2e5551fbc71b7db00fa Signed-off-by: Craig Hesling Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3937046 Reviewed-by: Tom Hughes --- third_party/rules.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/rules.mk b/third_party/rules.mk index eb4391b70c..57707d87dd 100644 --- a/third_party/rules.mk +++ b/third_party/rules.mk @@ -49,9 +49,9 @@ $(out)/RW/ec.RW.elf $(out)/RW/ec.RW_B.elf: $(out)/cryptoc/libcryptoc.a $(out)/$(PROJECT).exe: LDFLAGS_EXTRA += $(CRYPTOC_LDFLAGS) $(out)/$(PROJECT).exe: $(out)/cryptoc/libcryptoc.a # On-device tests. -test-targets=$(foreach test,$(test-list-y),\ +third-party-test-targets=$(foreach test,$(test-list-y),\ $(out)/RW/$(test).RW.elf $(out)/RO/$(test).RO.elf) -$(test-targets): LDFLAGS_EXTRA += $(CRYPTOC_LDFLAGS) -$(test-targets): $(out)/cryptoc/libcryptoc.a +$(third-party-test-targets): LDFLAGS_EXTRA += $(CRYPTOC_LDFLAGS) +$(third-party-test-targets): $(out)/cryptoc/libcryptoc.a endif # CONFIG_LIBCRYPTOC -- cgit v1.2.1