Allow tests to supply extra settings for their .cfg file

by setting $(TEST-EXTRA-CFG)

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/build/gen.mk b/build/gen.mk
index a7b759d044902aa57c64a88025e9637563ac1e57..d683560141c24e889d8d283053147e3d13e73dec 100644 (file)
--- 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)