From 2ddb4fe139211891ca4ef8d0ce3b64d0a249f980 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 24 Mar 2016 19:56:38 +0000 Subject: [PATCH] Allow tests to supply extra settings for their .cfg file by setting $(TEST-EXTRA-CFG) Signed-off-by: Andrew Cooper --- build/gen.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/gen.mk b/build/gen.mk index a7b759d..d683560 100644 --- a/build/gen.mk +++ b/build/gen.mk @@ -51,10 +51,11 @@ endif cfg-$(1) ?= $(defcfg-$(1)) test-$(1)-$(NAME).cfg: $$(cfg-$(1)) FORCE - @sed -e "s/@@NAME@@/$$(NAME)/g" \ + @{ cat $$< $(TEST-EXTRA-CFG) ;} | \ + sed -e "s/@@NAME@@/$$(NAME)/g" \ -e "s/@@ENV@@/$(1)/g" \ -e "s!@@PREFIX@@!$$(PREFIX)!g" \ - < $$< > $$@.tmp + > $$@.tmp @if ! cmp -s $$@ $$@.tmp; then mv -f $$@.tmp $$@; else rm -f $$@.tmp; fi -include $$(link-$(1):%.lds=%.d) -- 2.39.5