This is an automated email from the ASF dual-hosted git repository.
juergbi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream.git
from 16e45332b Merge pull request #2112 from apache/jbilleter/mirrors
add 202dc9d60 _loader: Drop redundant `ensure_fully_loaded()` for CLI
targets
add 7134c7ce5 _loader: Don't trigger second pass loading for junction
overrides
add dc0a2656d tests/format/junctions.py: Add override-self test for
nested-link bug
add 9f0c6dace tests/format/junctions.py: Test include from nested junction
new e39af277c Merge pull request #2114 from apache/jbilleter/loader
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/buildstream/_loader/loader.py | 17 ++----
tests/format/junctions.py | 64 ++++++++++++++++++++++
.../alternative-placeholder.bst} | 0
.../intermediate-project.bst | 12 ++++
.../intermediate-project}/project.conf | 2 +-
.../intermediate-project}/subproject.bst | 1 +
.../intermediate-project}/subproject/include.yml | 0
.../subproject/placeholder.bst} | 0
.../intermediate-project}/subproject/project.conf | 1 +
.../intermediate-project}/subproject/target.bst | 0
.../project.conf | 0
.../include-complex-nested/subproject.bst | 4 ++
.../target.bst | 0
tests/format/junctions/override-self-link/link.bst | 4 ++
.../junctions/override-self-link/nested-link.bst | 4 ++
.../junctions/override-self-link/project.conf | 6 ++
.../override-self-link}/subproject.bst | 0
.../subproject}/alternative.bst | 0
.../subproject}/include.yml | 0
.../subproject}/project.conf | 2 +-
.../subproject}/self-junction.bst | 1 +
.../subproject}/target.bst | 0
22 files changed, 105 insertions(+), 13 deletions(-)
copy tests/{frontend/default-target/elements/dummy_1.bst =>
format/junctions/include-complex-nested/alternative-placeholder.bst} (100%)
create mode 100644
tests/format/junctions/include-complex-nested/intermediate-project.bst
copy tests/format/junctions/{include-complex =>
include-complex-nested/intermediate-project}/project.conf (87%)
copy tests/format/junctions/{include-complex =>
include-complex-nested/intermediate-project}/subproject.bst (99%)
copy tests/format/junctions/{include-complex =>
include-complex-nested/intermediate-project}/subproject/include.yml (100%)
copy tests/{frontend/default-target/elements/dummy_1.bst =>
format/junctions/include-complex-nested/intermediate-project/subproject/placeholder.bst}
(100%)
copy tests/format/junctions/{include-complex =>
include-complex-nested/intermediate-project}/subproject/project.conf (85%)
copy tests/format/junctions/{include-complex =>
include-complex-nested/intermediate-project}/subproject/target.bst (100%)
copy tests/format/junctions/{include-complex =>
include-complex-nested}/project.conf (100%)
create mode 100644 tests/format/junctions/include-complex-nested/subproject.bst
copy tests/format/junctions/{include-complex =>
include-complex-nested}/target.bst (100%)
create mode 100644 tests/format/junctions/override-self-link/link.bst
create mode 100644 tests/format/junctions/override-self-link/nested-link.bst
create mode 100644 tests/format/junctions/override-self-link/project.conf
copy tests/format/{dependencies3/elements =>
junctions/override-self-link}/subproject.bst (100%)
copy tests/format/junctions/{override-self =>
override-self-link/subproject}/alternative.bst (100%)
copy tests/format/junctions/{nested-include/subproject/subsubproject =>
override-self-link/subproject}/include.yml (100%)
copy tests/format/junctions/{override-self =>
override-self-link/subproject}/project.conf (78%)
copy tests/format/junctions/{override-self =>
override-self-link/subproject}/self-junction.bst (99%)
copy tests/format/junctions/{override-self =>
override-self-link/subproject}/target.bst (100%)
