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 cd495825446d7c1d4d258def6d54a0ae9cbe4582..f8bf1400ac254dbbfb6ca619a60488edd48d8572 100644 (file)
--- 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 edca00514d14751620a87cb21aeb0238b7f861c2..a408d65c3118e5f298d602c863b32ad3bdc97372 100644 (file)
--- 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 38470b663a2da9efb049bf04953bf897d46bdb0c..948d2e2b28574a73c9f3ec4850567dcd86f97609 100644 (file)
--- 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 299cb72a427b5b08de87a3bf103b6d7dcedf045e..6827d188a6f5002ca0345c455f532e179b76ed79 100644 (file)
--- 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@@"