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/internal-and-conflict | |
| 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/internal-and-conflict')
17 files changed, 61 insertions, 0 deletions
diff --git a/tests/format/junctions/internal-and-conflict/project.conf b/tests/format/junctions/internal-and-conflict/project.conf new file mode 100644 index 000000000..20636c446 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/project.conf @@ -0,0 +1,2 @@ +name: test +min-version: 2.0 diff --git a/tests/format/junctions/internal-and-conflict/subproject.bst b/tests/format/junctions/internal-and-conflict/subproject.bst new file mode 100644 index 000000000..c88189cb0 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subproject.bst @@ -0,0 +1,4 @@ +kind: junction +sources: +- kind: local + path: subproject diff --git a/tests/format/junctions/internal-and-conflict/subproject/project.conf b/tests/format/junctions/internal-and-conflict/subproject/project.conf new file mode 100644 index 000000000..1d44ec886 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subproject/project.conf @@ -0,0 +1,6 @@ +name: subtest +min-version: 2.0 + +junctions: + internal: + - subsubproject.bst diff --git a/tests/format/junctions/internal-and-conflict/subproject/subsubproject.bst b/tests/format/junctions/internal-and-conflict/subproject/subsubproject.bst new file mode 100644 index 000000000..f535ab0e0 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subproject/subsubproject.bst @@ -0,0 +1,4 @@ +kind: junction +sources: +- kind: local + path: subsubproject diff --git a/tests/format/junctions/internal-and-conflict/subproject/subsubproject/project.conf b/tests/format/junctions/internal-and-conflict/subproject/subsubproject/project.conf new file mode 100644 index 000000000..d11bcbb30 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subproject/subsubproject/project.conf @@ -0,0 +1,2 @@ +name: subsubtest +min-version: 2.0 diff --git a/tests/format/junctions/internal-and-conflict/subproject/subsubproject/subsub.txt b/tests/format/junctions/internal-and-conflict/subproject/subsubproject/subsub.txt new file mode 100644 index 000000000..f73f3093f --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subproject/subsubproject/subsub.txt @@ -0,0 +1 @@ +file diff --git a/tests/format/junctions/internal-and-conflict/subproject/subsubproject/target.bst b/tests/format/junctions/internal-and-conflict/subproject/subsubproject/target.bst new file mode 100644 index 000000000..afafac601 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subproject/subsubproject/target.bst @@ -0,0 +1,4 @@ +kind: import +sources: +- kind: local + path: subsub.txt diff --git a/tests/format/junctions/internal-and-conflict/subproject/subtarget.bst b/tests/format/junctions/internal-and-conflict/subproject/subtarget.bst new file mode 100644 index 000000000..5e6a76bac --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subproject/subtarget.bst @@ -0,0 +1,10 @@ +kind: compose + +# Use a build dependency on our internal subsubproject target. +# +# There is currently no validation for this but it may be +# introduced in the future. For correctness of this test, +# use a build dependency. +# +build-depends: +- subsubproject.bst:target.bst diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-again.bst b/tests/format/junctions/internal-and-conflict/subsubproject-again.bst new file mode 100644 index 000000000..308642704 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-again.bst @@ -0,0 +1,4 @@ +kind: junction +sources: +- kind: local + path: subsubproject-again diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-again/project.conf b/tests/format/junctions/internal-and-conflict/subsubproject-again/project.conf new file mode 100644 index 000000000..d11bcbb30 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-again/project.conf @@ -0,0 +1,2 @@ +name: subsubtest +min-version: 2.0 diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-again/subsub-again.txt b/tests/format/junctions/internal-and-conflict/subsubproject-again/subsub-again.txt new file mode 100644 index 000000000..f73f3093f --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-again/subsub-again.txt @@ -0,0 +1 @@ +file diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-again/target.bst b/tests/format/junctions/internal-and-conflict/subsubproject-again/target.bst new file mode 100644 index 000000000..1a90211de --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-again/target.bst @@ -0,0 +1,4 @@ +kind: import +sources: +- kind: local + path: subsub-again.txt diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-conflict.bst b/tests/format/junctions/internal-and-conflict/subsubproject-conflict.bst new file mode 100644 index 000000000..e4715ea1d --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-conflict.bst @@ -0,0 +1,4 @@ +kind: junction +sources: +- kind: local + path: subsubproject-conflict diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-conflict/project.conf b/tests/format/junctions/internal-and-conflict/subsubproject-conflict/project.conf new file mode 100644 index 000000000..d11bcbb30 --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-conflict/project.conf @@ -0,0 +1,2 @@ +name: subsubtest +min-version: 2.0 diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-conflict/subsub-again.txt b/tests/format/junctions/internal-and-conflict/subsubproject-conflict/subsub-again.txt new file mode 100644 index 000000000..f73f3093f --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-conflict/subsub-again.txt @@ -0,0 +1 @@ +file diff --git a/tests/format/junctions/internal-and-conflict/subsubproject-conflict/target.bst b/tests/format/junctions/internal-and-conflict/subsubproject-conflict/target.bst new file mode 100644 index 000000000..1a90211de --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/subsubproject-conflict/target.bst @@ -0,0 +1,4 @@ +kind: import +sources: +- kind: local + path: subsub-again.txt diff --git a/tests/format/junctions/internal-and-conflict/target.bst b/tests/format/junctions/internal-and-conflict/target.bst new file mode 100644 index 000000000..5e661e6ba --- /dev/null +++ b/tests/format/junctions/internal-and-conflict/target.bst @@ -0,0 +1,6 @@ +kind: stack + +depends: +- subproject.bst:subtarget.bst +- subsubproject-again.bst:target.bst +- subsubproject-conflict.bst:target.bst |