From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 24 Mar 2016 19:56:38 +0000 (+0000)
Subject: Allow tests to supply extra settings for their .cfg file
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2ddb4fe139211891ca4ef8d0ce3b64d0a249f980;p=people%2Froyger%2Fxen-test-framework.git

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 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)