diff options
author | bst-marge-bot <marge-bot@buildstream.build> | 2020-06-24 06:47:06 +0000 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-06-24 06:47:06 +0000 |
commit | 88f280d541e2f7c7b8655bab65bb1eb682872a16 (patch) | |
tree | aeb0a23c5ee8cec0c1ffcf61da1f83453fa63601 /tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject | |
parent | e4e3b4568e6f7e1575fdd90ec2c688ceee97322e (diff) | |
parent | 3d5d655e40470a805999834560605d6e54bd7d72 (diff) | |
download | buildstream-88f280d541e2f7c7b8655bab65bb1eb682872a16.tar.gz |
Merge branch 'tristan/junction-jungle' into 'master'
Explicit control of junction configuration overrides
Closes #1326
See merge request BuildStream/buildstream!1901
Diffstat (limited to 'tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject')
5 files changed, 13 insertions, 0 deletions
diff --git a/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/project.conf b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/project.conf new file mode 100644 index 000000000..d11bcbb30 --- /dev/null +++ b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/project.conf @@ -0,0 +1,2 @@ +name: subsubtest +min-version: 2.0 diff --git a/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject.bst b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject.bst new file mode 100644 index 000000000..bce64597b --- /dev/null +++ b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject.bst @@ -0,0 +1,4 @@ +kind: junction +sources: +- kind: local + path: subsubsubproject diff --git a/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/original.txt b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/original.txt new file mode 100644 index 000000000..f73f3093f --- /dev/null +++ b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/original.txt @@ -0,0 +1 @@ +file diff --git a/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/project.conf b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/project.conf new file mode 100644 index 000000000..e508da808 --- /dev/null +++ b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/project.conf @@ -0,0 +1,2 @@ +name: subsubsubtest +min-version: 2.0 diff --git a/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/target.bst b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/target.bst new file mode 100644 index 000000000..61edc6467 --- /dev/null +++ b/tests/format/junctions/duplicates-override-twice-link/subproject/subsubproject/subsubsubproject/target.bst @@ -0,0 +1,4 @@ +kind: import +sources: +- kind: local + path: original.txt |