summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2017-12-08 19:28:49 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2018-01-25 13:27:41 +0000
commita921474d0731e03e1e9e788ec3905d99ec0754ea (patch)
tree1ca69b1cbb5c18ac6a7db26c1626c19e0bf4c5eb
parent24b730f8e16b13343b3955ffa01462a0fbf6a2df (diff)
downloadbuildstream-a921474d0731e03e1e9e788ec3905d99ec0754ea.tar.gz
tests: Move test_overlaps test files
This was done so that the files can be re-used with different project.conf.
-rw-r--r--tests/frontend/overlaps.py2
-rw-r--r--tests/frontend/overlaps/basic/project.conf (renamed from tests/frontend/overlaps/project.conf)1
-rw-r--r--tests/frontend/overlaps/one.bst2
-rw-r--r--tests/frontend/overlaps/three.bst2
-rw-r--r--tests/frontend/overlaps/two.bst2
5 files changed, 5 insertions, 4 deletions
diff --git a/tests/frontend/overlaps.py b/tests/frontend/overlaps.py
index 7009cd19d..f62a18132 100644
--- a/tests/frontend/overlaps.py
+++ b/tests/frontend/overlaps.py
@@ -11,7 +11,7 @@ DATA_DIR = os.path.join(
@pytest.mark.datafiles(DATA_DIR)
def test_overlaps(cli, datafiles):
- project = os.path.join(datafiles.dirname, datafiles.basename)
+ project = os.path.join(datafiles.dirname, datafiles.basename, "basic")
result = cli.run(project=project, silent=True, args=[
'build', 'collect.bst'])
diff --git a/tests/frontend/overlaps/project.conf b/tests/frontend/overlaps/basic/project.conf
index 2027cc27a..d903e16c7 100644
--- a/tests/frontend/overlaps/project.conf
+++ b/tests/frontend/overlaps/basic/project.conf
@@ -1,3 +1,4 @@
# Basic project configuration that doesnt override anything
#
name: pony
+element-path: "../"
diff --git a/tests/frontend/overlaps/one.bst b/tests/frontend/overlaps/one.bst
index 292970707..e5560832d 100644
--- a/tests/frontend/overlaps/one.bst
+++ b/tests/frontend/overlaps/one.bst
@@ -4,4 +4,4 @@ config:
target: /
sources:
- kind: local
- path: one
+ path: "../one"
diff --git a/tests/frontend/overlaps/three.bst b/tests/frontend/overlaps/three.bst
index 07eb7252d..f52588ab8 100644
--- a/tests/frontend/overlaps/three.bst
+++ b/tests/frontend/overlaps/three.bst
@@ -4,4 +4,4 @@ config:
target: /
sources:
- kind: local
- path: three
+ path: "../three"
diff --git a/tests/frontend/overlaps/two.bst b/tests/frontend/overlaps/two.bst
index 21366506c..14686b875 100644
--- a/tests/frontend/overlaps/two.bst
+++ b/tests/frontend/overlaps/two.bst
@@ -4,4 +4,4 @@ config:
target: /
sources:
- kind: local
- path: two
+ path: "../two"