summaryrefslogtreecommitdiff
path: root/tests/format/junctions/conflicts/subproject2/sub2.txt
diff options
context:
space:
mode:
authorTristan van Berkom <tristan.vanberkom@codethink.co.uk>2020-06-08 19:08:04 +0900
committerTristan van Berkom <tristan.vanberkom@codethink.co.uk>2020-06-23 19:27:10 +0900
commit364ea9dd96f953e96f954669958e60741380e0ff (patch)
treecebda392fa4c6ae7657de9e8d022b29288399a5c /tests/format/junctions/conflicts/subproject2/sub2.txt
parent5f75fefe5f66175664bd7ab317552fd1a2c6b650 (diff)
downloadbuildstream-364ea9dd96f953e96f954669958e60741380e0ff.tar.gz
tests/format/junctions.py: Adding tests for the overrides feature
* Test various scenarios of overriding junctions, including deep paths as junctions to override, and as junctions to use to override. * Test conflicting junction configurations, ensuring that we report both provenances of where the junctions were declared. * Test circular references in element paths while declaring overrides, for instance when trying to override a subproject using a deeper definition of the same subproject.
Diffstat (limited to 'tests/format/junctions/conflicts/subproject2/sub2.txt')
-rw-r--r--tests/format/junctions/conflicts/subproject2/sub2.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/format/junctions/conflicts/subproject2/sub2.txt b/tests/format/junctions/conflicts/subproject2/sub2.txt
new file mode 100644
index 000000000..f73f3093f
--- /dev/null
+++ b/tests/format/junctions/conflicts/subproject2/sub2.txt
@@ -0,0 +1 @@
+file