From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 22 Feb 2016 12:43:46 +0000 (+0000)
Subject: Accept a PREFIX parameter when generating test configuration
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2b88b7ec3c388ccfca591dc6a6d30392f10f2847;p=people%2Froyger%2Fxen-test-framework.git

Accept a PREFIX parameter when generating test configuration

This allows the test paths to be configured for the install destination if it
isn't to be run out the build working tree.

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

diff --git a/build/common.mk b/build/common.mk
index cd49582..f8bf140 100644
--- a/build/common.mk
+++ b/build/common.mk
@@ -1,5 +1,6 @@
 ROOT := $(abspath $(CURDIR)/../..)
 DESTDIR ?= $(ROOT)/dist/
+PREFIX ?= $(ROOT)
 CC = gcc
 
 ALL_ENVIRONMENTS   := pv64 pv32pae hvm64 hvm32pae hvm32
diff --git a/build/gen.mk b/build/gen.mk
index edca005..a408d65 100644
--- a/build/gen.mk
+++ b/build/gen.mk
@@ -38,6 +38,7 @@ cfg-$(1) ?= $(defcfg-$(1))
 test-$(1)-$(NAME).cfg: $$(cfg-$(1))
 	sed -e "s/@@NAME@@/$$(NAME)/g" \
 		-e "s/@@ENV@@/$(1)/g" \
+		-e "s!@@PREFIX@@!$$(PREFIX)!g" \
 		< $$< > $$@
 
 -include $$(link-$(1):%.lds=%.d)
diff --git a/config/default-hvm.cfg.in b/config/default-hvm.cfg.in
index 38470b6..948d2e2 100644
--- a/config/default-hvm.cfg.in
+++ b/config/default-hvm.cfg.in
@@ -1,7 +1,7 @@
 name="test-@@ENV@@-@@NAME@@"
 builder="hvm"
 memory=128
-firmware_override="test-@@ENV@@-@@NAME@@"
+firmware_override="@@PREFIX@@/test-@@ENV@@-@@NAME@@"
 
 # The framework doesn't reboot.  A reboot signal is almost certainly a triple
 # fault instead.  Prevent it turning into a runaway domain.
diff --git a/config/default-pv.cfg.in b/config/default-pv.cfg.in
index 299cb72..6827d18 100644
--- a/config/default-pv.cfg.in
+++ b/config/default-pv.cfg.in
@@ -1,4 +1,4 @@
 name="test-@@ENV@@-@@NAME@@"
 loader="generic"
 memory=128
-kernel="test-@@ENV@@-@@NAME@@"
+kernel="@@PREFIX@@/test-@@ENV@@-@@NAME@@"