summaryrefslogtreecommitdiff
path: root/tests/integration/project/elements
diff options
context:
space:
mode:
authorPhillip Smyth <phillip.smyth@codethink.co.uk>2018-03-07 15:02:01 +0000
committerPhillip Smyth <phillip.smyth@codethink.co.uk>2018-03-26 15:27:47 +0000
commitb0e6a45e7d34ef969734bc5c607ce97a229a4f77 (patch)
treef87ede105b8912851530a702f945aa614d344516 /tests/integration/project/elements
parente91dc8336074d22126e559a29e23ef2d52c5506a (diff)
downloadbuildstream-b0e6a45e7d34ef969734bc5c607ce97a229a4f77.tar.gz
Generate unique subdirs for built elements
Based on issue 89 (https://gitlab.com/BuildStream/buildstream/issues/89) Ensuring that elements are staged into unique subdirs while building. This patch supports that by doing the following: * Modify project config to add 2 new variables ("project-name" and "element-name") * Changed the default install-root from "/buildstream/install" to "/buildstream-install" * Update the tests to accommodate these changes * Update the expected cache keys in the tests This fixes #89
Diffstat (limited to 'tests/integration/project/elements')
-rw-r--r--tests/integration/project/elements/stack/another-hi.bst4
-rw-r--r--tests/integration/project/elements/stack/hi.bst4
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/integration/project/elements/stack/another-hi.bst b/tests/integration/project/elements/stack/another-hi.bst
index eb98dea36..f83fdee82 100644
--- a/tests/integration/project/elements/stack/another-hi.bst
+++ b/tests/integration/project/elements/stack/another-hi.bst
@@ -7,5 +7,5 @@ depends:
config:
commands:
- - "mkdir -p /buildstream/install"
- - "echo 'Another hi' > /buildstream/install/another-hi"
+ - "mkdir -p %{install-root}"
+ - "echo 'Another hi' > %{install-root}/another-hi"
diff --git a/tests/integration/project/elements/stack/hi.bst b/tests/integration/project/elements/stack/hi.bst
index adbf81537..0aa2d32f2 100644
--- a/tests/integration/project/elements/stack/hi.bst
+++ b/tests/integration/project/elements/stack/hi.bst
@@ -4,5 +4,5 @@ depends:
type: build
config:
commands:
- - "mkdir -p /buildstream/install"
- - "echo 'Hi' > /buildstream/install/hi"
+ - "mkdir -p %{install-root}"
+ - "echo 'Hi' > %{install-root}/hi"