You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by gi...@apache.org on 2020/12/29 13:24:15 UTC
[buildstream] branch chandan/stack-stricter-warnings created (now
4c55e8e)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at 4c55e8e fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
This branch includes the following new commits:
new a2c9a6b elements/stack.py: Forbid sources and build dependencies
new 837017a elements/stack.py: Indicate that it does not run sandbox commands
new d866214 tests: Remove build dependencies from stack elements
new 5e2acf1 fixup! tests: Remove build dependencies from stack elements
new 282001b fixup! fixup! tests: Remove build dependencies from stack elements
new ab29699 fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new e215032 fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new 4ded095 fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new 852a719 fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new 2427c93 fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new 9bfc0aa fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new 4a6d51e fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new ce398b8 fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
new 4c55e8e fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
The 14 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.
[buildstream] 14/14: fixup! fixup! fixup! fixup! fixup! fixup!
fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from
stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 4c55e8ead3dc481acd5b781bc41a799b4b58616f
Author: Chandan Singh <ch...@chandansingh.net>
AuthorDate: Tue Jul 16 20:20:54 2019 +0100
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
.../project/elements/target-push-pull-no-strict.bst | 10 ++++++++++
tests/frontend/pull.py | 13 +++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/tests/frontend/project/elements/target-push-pull-no-strict.bst b/tests/frontend/project/elements/target-push-pull-no-strict.bst
new file mode 100644
index 0000000..4d3da82
--- /dev/null
+++ b/tests/frontend/project/elements/target-push-pull-no-strict.bst
@@ -0,0 +1,10 @@
+kind: script
+description: |
+
+ Main target for tests/frontend/pull.py::test_push_pull_non_strict().
+ We do not use target.bst as we want an element kind that supports
+ build dependencies.
+
+build-depends:
+- import-bin.bst
+- compose-all.bst
diff --git a/tests/frontend/pull.py b/tests/frontend/pull.py
index a87a311..fc64884 100644
--- a/tests/frontend/pull.py
+++ b/tests/frontend/pull.py
@@ -216,6 +216,7 @@ def test_push_pull_specific_remote(cli, tmpdir, datafiles):
@pytest.mark.datafiles(DATA_DIR)
def test_push_pull_non_strict(cli, tmpdir, datafiles):
project = str(datafiles)
+ target = "target-push-pull-no-strict.bst"
with create_artifact_share(os.path.join(str(tmpdir), 'artifactshare')) as share:
# First build the target element and push to the remote.
@@ -225,12 +226,12 @@ def test_push_pull_non_strict(cli, tmpdir, datafiles):
'test': {'strict': False}
}
})
- result = cli.run(project=project, args=['build', 'target.bst'])
+ result = cli.run(project=project, args=['build', target])
result.assert_success()
- assert cli.get_element_state(project, 'target.bst') == 'cached'
+ assert cli.get_element_state(project, target) == 'cached'
# Assert that everything is now cached in the remote.
- all_elements = ['target.bst', 'import-bin.bst', 'import-dev.bst', 'compose-all.bst']
+ all_elements = [target, 'import-bin.bst', 'import-dev.bst', 'compose-all.bst']
for element_name in all_elements:
assert_shared(cli, share, project, element_name)
@@ -253,14 +254,14 @@ def test_push_pull_non_strict(cli, tmpdir, datafiles):
# Assert that the workspaced element requires a rebuild
assert cli.get_element_state(project, 'import-bin.bst') == 'buildable'
# Assert that the target is still waiting due to --no-strict
- assert cli.get_element_state(project, 'target.bst') == 'waiting'
+ assert cli.get_element_state(project, target) == 'waiting'
# Now try bst artifact pull
- result = cli.run(project=project, args=['artifact', 'pull', '--deps', 'all', 'target.bst'])
+ result = cli.run(project=project, args=['artifact', 'pull', '--deps', 'all', target])
result.assert_success()
# And assert that the target is again in the local cache, without having built
- assert cli.get_element_state(project, 'target.bst') == 'cached'
+ assert cli.get_element_state(project, target) == 'cached'
# Regression test for https://gitlab.com/BuildStream/buildstream/issues/202
[buildstream] 09/14: fixup! fixup! fixup! fixup! fixup! fixup!
tests: Remove build dependencies from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 852a7193646f63bc8bf3dc1f6020bb974aa8ff86
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 15:29:53 2019 +0100
fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
tests/cachekey/project/target.expected | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index a2076ad..222a9be 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-c544f5b34525019a94ebf546ffd8f2040a5d283781e93bcccf6144621d846cb7
\ No newline at end of file
+9576c84e1c881e74ed26ae75f339b45577538a49b3728210857a167aae8b37a6
\ No newline at end of file
[buildstream] 12/14: fixup! fixup! fixup! fixup! fixup! fixup!
fixup! fixup! fixup! tests: Remove build dependencies from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 4a6d51e0b4ab2e536fc256d5f730cca982ce2ce5
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 17:51:58 2019 +0100
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
tests/format/dependencies1/elements/list-combine.bst | 2 +-
tests/format/dependencies1/elements/list-overlap.bst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/format/dependencies1/elements/list-combine.bst b/tests/format/dependencies1/elements/list-combine.bst
index d01293f..d39ddd3 100644
--- a/tests/format/dependencies1/elements/list-combine.bst
+++ b/tests/format/dependencies1/elements/list-combine.bst
@@ -4,5 +4,5 @@ build-depends:
- firstdep.bst
runtime-depends:
- seconddep.bst
-runtime-depends:
+depends:
- thirddep.bst
diff --git a/tests/format/dependencies1/elements/list-overlap.bst b/tests/format/dependencies1/elements/list-overlap.bst
index 9451fc3..5fee6f1 100644
--- a/tests/format/dependencies1/elements/list-overlap.bst
+++ b/tests/format/dependencies1/elements/list-overlap.bst
@@ -1,4 +1,4 @@
-kind: stack
+kind: manual
description: This element depends on two elements in different ways
build-depends:
- firstdep.bst
[buildstream] 07/14: fixup! fixup! fixup! fixup! tests: Remove
build dependencies from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit e215032919340667914c53c65efdd9d5c717d2d4
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 15:19:31 2019 +0100
fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
tests/frontend/track.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/frontend/track.py b/tests/frontend/track.py
index a628043..aabcbed 100644
--- a/tests/frontend/track.py
+++ b/tests/frontend/track.py
@@ -260,7 +260,7 @@ def test_inconsistent_junction(cli, tmpdir, datafiles, ref_storage):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -276,7 +276,7 @@ def test_inconsistent_junction(cli, tmpdir, datafiles, ref_storage):
# Assert that we have the expected provenance encoded into the error
element_node = _yaml.load(element_path, shortname='junction-dep.bst')
- ref_node = element_node.get_sequence('depends').mapping_at(0)
+ ref_node = element_node.get_sequence('runtime-depends').mapping_at(0)
provenance = ref_node.get_provenance()
assert str(provenance) in result.stderr
@@ -300,7 +300,7 @@ def test_junction_element(cli, tmpdir, datafiles, ref_storage):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -315,7 +315,7 @@ def test_junction_element(cli, tmpdir, datafiles, ref_storage):
# Assert that we have the expected provenance encoded into the error
element_node = _yaml.load(element_path, shortname='junction-dep.bst')
- ref_node = element_node.get_sequence('depends').mapping_at(0)
+ ref_node = element_node.get_sequence('runtime-depends').mapping_at(0)
provenance = ref_node.get_provenance()
assert str(provenance) in result.stderr
[buildstream] 02/14: elements/stack.py: Indicate that it does not
run sandbox commands
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 837017a71287ad9352e77c9b228851bb1ddbebe6
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 12:19:11 2019 +0100
elements/stack.py: Indicate that it does not run sandbox commands
Since the `stack` element does not run any commands inside the sandbox,
indicate so in its class definition.
---
src/buildstream/plugins/elements/stack.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/buildstream/plugins/elements/stack.py b/src/buildstream/plugins/elements/stack.py
index 4cacd3f..62aefa8 100644
--- a/src/buildstream/plugins/elements/stack.py
+++ b/src/buildstream/plugins/elements/stack.py
@@ -36,6 +36,9 @@ class StackElement(Element):
# This plugin ignores sources, so disallow them
BST_FORBID_SOURCES = True
+ # This plugin does not run any commands using Sandbox.run()
+ BST_RUN_COMMANDS = False
+
# This plugin has been modified to avoid the use of Sandbox.get_directory
BST_VIRTUAL_DIRECTORY = True
[buildstream] 04/14: fixup! tests: Remove build dependencies from
stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 5e2acf1f95a8a30ed575f9be38d09bcbe7d5cde4
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 15:12:45 2019 +0100
fixup! tests: Remove build dependencies from stack elements
---
tests/frontend/fetch.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py
index ff5afd8..d8fe6d7 100644
--- a/tests/frontend/fetch.py
+++ b/tests/frontend/fetch.py
@@ -171,6 +171,6 @@ def test_inconsistent_junction(cli, tmpdir, datafiles, ref_storage):
# Assert that we have the expected provenance encoded into the error
element_node = _yaml.load(element_path, shortname='junction-dep.bst')
- ref_node = element_node.get_sequence('depends').mapping_at(0)
+ ref_node = element_node.get_sequence('runtime-depends').mapping_at(0)
provenance = ref_node.get_provenance()
assert str(provenance) in result.stderr
[buildstream] 03/14: tests: Remove build dependencies from stack
elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit d8662147987bbbead34ea769e358d1420bca76fc
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 15:05:17 2019 +0100
tests: Remove build dependencies from stack elements
Since the `stack` element ignores its build dependencies, we'd like to
disallow them, but we need to fix our tests first.
---
.../testing/_sourcetests/project/elements/base.bst | 2 +-
tests/artifactcache/junctions/parent/target.bst | 2 +-
tests/artifactcache/project/elements/target.bst | 2 +-
tests/cachekey/project/target.bst | 2 +-
tests/format/dependencies1/elements/circulartarget.bst | 2 +-
tests/format/dependencies1/elements/list-combine.bst | 2 +-
tests/format/dependencies1/elements/list-overlap.bst | 5 ++---
tests/format/dependencies1/elements/shareddep.bst | 2 +-
tests/format/dependencies1/elements/shareddeptarget.bst | 2 +-
tests/format/dependencies1/elements/target.bst | 2 +-
tests/format/junctions/bar/target.bst | 2 +-
tests/format/junctions/config-target/elements/target.bst | 2 +-
tests/format/junctions/conflict/target.bst | 2 +-
tests/format/junctions/foo/target.bst | 2 +-
tests/format/junctions/invalid/junction-dep.bst | 2 +-
tests/format/junctions/invalid/junction-with-deps.bst | 2 +-
.../junctions/invalid/junctiondep-not-a-junction.bst | 2 +-
tests/format/junctions/invalid/missing-element.bst | 2 +-
tests/format/junctions/invalid/missing.bst | 2 +-
.../junctions/missing-element/junctionA/target.bst | 2 +-
.../missing-element/sub-target-bad-junction.bst | 2 +-
tests/format/junctions/missing-element/sub-target.bst | 2 +-
tests/format/junctions/missing-element/target.bst | 2 +-
tests/format/junctions/nested/target.bst | 2 +-
tests/format/junctions/options-default/target.bst | 2 +-
tests/format/junctions/options-inherit/target.bst | 2 +-
tests/format/junctions/options/target.bst | 2 +-
tests/format/junctions/toplevel/target.bst | 2 +-
tests/frontend/buildcheckout.py | 16 ++++++++--------
tests/frontend/completions/no-element-path/target.bst | 2 +-
tests/frontend/completions/project/elements/target.bst | 2 +-
tests/frontend/completions/sub-folders/elements/base.bst | 2 +-
tests/frontend/fetch.py | 4 ++--
tests/frontend/project/elements/invalid-chars-in-dep.bst | 2 +-
tests/frontend/project/elements/target.bst | 2 +-
tests/frontend/project/elements/target2.bst | 2 +-
tests/frontend/project_fail/elements/target.bst | 2 +-
tests/frontend/project_world/elements/checkout-deps.bst | 9 +++------
tests/frontend/project_world/elements/target.bst | 2 +-
tests/frontend/track-cross-junction/subproject.bst | 2 +-
tests/frontend/workspaced-build-dep/elements/stack.bst | 2 +-
tests/frontend/workspaced-runtime-dep/elements/stack.bst | 2 +-
tests/integration/project/elements/base.bst | 2 +-
tests/integration/project/elements/stack/stack.bst | 2 +-
tests/remoteexecution/project/elements/base.bst | 2 +-
.../project/files/sub-project/elements/base.bst | 2 +-
tests/sandboxes/project/elements/base.bst | 2 +-
tests/sourcecache/project/elements/target.bst | 2 +-
.../sources/local/deterministic-umask/elements/base.bst | 2 +-
tests/sources/project/elements/base.bst | 2 +-
50 files changed, 61 insertions(+), 65 deletions(-)
diff --git a/src/buildstream/testing/_sourcetests/project/elements/base.bst b/src/buildstream/testing/_sourcetests/project/elements/base.bst
index 428afa7..1f72c50 100644
--- a/src/buildstream/testing/_sourcetests/project/elements/base.bst
+++ b/src/buildstream/testing/_sourcetests/project/elements/base.bst
@@ -1,5 +1,5 @@
# elements/base.bst
kind: stack
-depends:
+runtime-depends:
- base/base-alpine.bst
diff --git a/tests/artifactcache/junctions/parent/target.bst b/tests/artifactcache/junctions/parent/target.bst
index 092fd96..b47ddc5 100644
--- a/tests/artifactcache/junctions/parent/target.bst
+++ b/tests/artifactcache/junctions/parent/target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- junction: base.bst
filename: base-element.bst
- app.bst
diff --git a/tests/artifactcache/project/elements/target.bst b/tests/artifactcache/project/elements/target.bst
index ba489f1..9141533 100644
--- a/tests/artifactcache/project/elements/target.bst
+++ b/tests/artifactcache/project/elements/target.bst
@@ -3,7 +3,7 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- import-bin.bst
- import-dev.bst
- compose-all.bst
diff --git a/tests/cachekey/project/target.bst b/tests/cachekey/project/target.bst
index cabf3f7..ed461d0 100644
--- a/tests/cachekey/project/target.bst
+++ b/tests/cachekey/project/target.bst
@@ -3,7 +3,7 @@ description: |
This is the main entry point including cases in the cache key test.
-depends:
+runtime-depends:
- sources/bzr1.bst
- sources/git1.bst
- sources/git2.bst
diff --git a/tests/format/dependencies1/elements/circulartarget.bst b/tests/format/dependencies1/elements/circulartarget.bst
index eac5046..662f945 100644
--- a/tests/format/dependencies1/elements/circulartarget.bst
+++ b/tests/format/dependencies1/elements/circulartarget.bst
@@ -1,4 +1,4 @@
kind: stack
description: This is a main target which introduces a circular dependency
-depends:
+runtime-depends:
- circular-firstdep.bst
diff --git a/tests/format/dependencies1/elements/list-combine.bst b/tests/format/dependencies1/elements/list-combine.bst
index ed34522..78ebdb6 100644
--- a/tests/format/dependencies1/elements/list-combine.bst
+++ b/tests/format/dependencies1/elements/list-combine.bst
@@ -4,5 +4,5 @@ build-depends:
- firstdep.bst
runtime-depends:
- seconddep.bst
-depends:
+runtime-depends:
- thirddep.bst
diff --git a/tests/format/dependencies1/elements/list-overlap.bst b/tests/format/dependencies1/elements/list-overlap.bst
index 0ee94f1..9451fc3 100644
--- a/tests/format/dependencies1/elements/list-overlap.bst
+++ b/tests/format/dependencies1/elements/list-overlap.bst
@@ -2,6 +2,5 @@ kind: stack
description: This element depends on two elements in different ways
build-depends:
- firstdep.bst
-depends:
-- filename: firstdep.bst
- type: runtime
+runtime-depends:
+- firstdep.bst
diff --git a/tests/format/dependencies1/elements/shareddep.bst b/tests/format/dependencies1/elements/shareddep.bst
index ac123e2..4be3539 100644
--- a/tests/format/dependencies1/elements/shareddep.bst
+++ b/tests/format/dependencies1/elements/shareddep.bst
@@ -1,4 +1,4 @@
kind: stack
description: This is the first dependency
-depends:
+runtime-depends:
- firstdep.bst
diff --git a/tests/format/dependencies1/elements/shareddeptarget.bst b/tests/format/dependencies1/elements/shareddeptarget.bst
index b6efb13..e127c64 100644
--- a/tests/format/dependencies1/elements/shareddeptarget.bst
+++ b/tests/format/dependencies1/elements/shareddeptarget.bst
@@ -1,5 +1,5 @@
kind: stack
description: This is the main target
-depends:
+runtime-depends:
- firstdep.bst
- shareddep.bst
diff --git a/tests/format/dependencies1/elements/target.bst b/tests/format/dependencies1/elements/target.bst
index b856b0f..04e3e45 100644
--- a/tests/format/dependencies1/elements/target.bst
+++ b/tests/format/dependencies1/elements/target.bst
@@ -1,4 +1,4 @@
kind: stack
description: This is the main target
-depends:
+runtime-depends:
- firstdep.bst
diff --git a/tests/format/junctions/bar/target.bst b/tests/format/junctions/bar/target.bst
index 70b78a3..26736f4 100644
--- a/tests/format/junctions/bar/target.bst
+++ b/tests/format/junctions/bar/target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- junction: base.bst
filename: target.bst
- app.bst
diff --git a/tests/format/junctions/config-target/elements/target.bst b/tests/format/junctions/config-target/elements/target.bst
index 50d7448..56f0479 100644
--- a/tests/format/junctions/config-target/elements/target.bst
+++ b/tests/format/junctions/config-target/elements/target.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- subsubproject.bst:hello.bst
diff --git a/tests/format/junctions/conflict/target.bst b/tests/format/junctions/conflict/target.bst
index 5e280e5..3d38ea6 100644
--- a/tests/format/junctions/conflict/target.bst
+++ b/tests/format/junctions/conflict/target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- junction: foo.bst
filename: target.bst
- junction: bar.bst
diff --git a/tests/format/junctions/foo/target.bst b/tests/format/junctions/foo/target.bst
index 70b78a3..26736f4 100644
--- a/tests/format/junctions/foo/target.bst
+++ b/tests/format/junctions/foo/target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- junction: base.bst
filename: target.bst
- app.bst
diff --git a/tests/format/junctions/invalid/junction-dep.bst b/tests/format/junctions/invalid/junction-dep.bst
index 20fd300..e4635b6 100644
--- a/tests/format/junctions/invalid/junction-dep.bst
+++ b/tests/format/junctions/invalid/junction-dep.bst
@@ -1,3 +1,3 @@
kind: stack
-depends:
+runtime-depends:
- base.bst
diff --git a/tests/format/junctions/invalid/junction-with-deps.bst b/tests/format/junctions/invalid/junction-with-deps.bst
index d2ca337..2bb6f9f 100644
--- a/tests/format/junctions/invalid/junction-with-deps.bst
+++ b/tests/format/junctions/invalid/junction-with-deps.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- junction: base-with-deps.bst
filename: target.bst
diff --git a/tests/format/junctions/invalid/junctiondep-not-a-junction.bst b/tests/format/junctions/invalid/junctiondep-not-a-junction.bst
index c59f1be..076ed49 100644
--- a/tests/format/junctions/invalid/junctiondep-not-a-junction.bst
+++ b/tests/format/junctions/invalid/junctiondep-not-a-junction.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- junction: app.bst
filename: target.bst
diff --git a/tests/format/junctions/invalid/missing-element.bst b/tests/format/junctions/invalid/missing-element.bst
index 4c29221..261535d 100644
--- a/tests/format/junctions/invalid/missing-element.bst
+++ b/tests/format/junctions/invalid/missing-element.bst
@@ -4,6 +4,6 @@
# in the subproject.
#
kind: stack
-depends:
+runtime-depends:
- junction: base.bst
filename: foo.bst
diff --git a/tests/format/junctions/invalid/missing.bst b/tests/format/junctions/invalid/missing.bst
index 672e967..cfa307e 100644
--- a/tests/format/junctions/invalid/missing.bst
+++ b/tests/format/junctions/invalid/missing.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- junction: missingfile.bst
filename: target.bst
diff --git a/tests/format/junctions/missing-element/junctionA/target.bst b/tests/format/junctions/missing-element/junctionA/target.bst
index 9c3d0bf..4da490d 100644
--- a/tests/format/junctions/missing-element/junctionA/target.bst
+++ b/tests/format/junctions/missing-element/junctionA/target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- filename: missing.bst
junction: junction-B.bst
diff --git a/tests/format/junctions/missing-element/sub-target-bad-junction.bst b/tests/format/junctions/missing-element/sub-target-bad-junction.bst
index f48f6ce..ab8112e 100644
--- a/tests/format/junctions/missing-element/sub-target-bad-junction.bst
+++ b/tests/format/junctions/missing-element/sub-target-bad-junction.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- filename: bad-junction-target.bst
junction: junction-A.bst
diff --git a/tests/format/junctions/missing-element/sub-target.bst b/tests/format/junctions/missing-element/sub-target.bst
index 79e8bc6..bf8e9db 100644
--- a/tests/format/junctions/missing-element/sub-target.bst
+++ b/tests/format/junctions/missing-element/sub-target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- filename: target.bst
junction: junction-A.bst
diff --git a/tests/format/junctions/missing-element/target.bst b/tests/format/junctions/missing-element/target.bst
index 69ecef7..b1ece45 100644
--- a/tests/format/junctions/missing-element/target.bst
+++ b/tests/format/junctions/missing-element/target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- filename: missing.bst
junction: junction-A.bst
diff --git a/tests/format/junctions/nested/target.bst b/tests/format/junctions/nested/target.bst
index db59499..c41da87 100644
--- a/tests/format/junctions/nested/target.bst
+++ b/tests/format/junctions/nested/target.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- junction: foo.bst
filename: target.bst
diff --git a/tests/format/junctions/options-default/target.bst b/tests/format/junctions/options-default/target.bst
index 8395c0c..23fd3e2 100644
--- a/tests/format/junctions/options-default/target.bst
+++ b/tests/format/junctions/options-default/target.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- junction: base.bst
filename: target.bst
diff --git a/tests/format/junctions/options-inherit/target.bst b/tests/format/junctions/options-inherit/target.bst
index 8395c0c..23fd3e2 100644
--- a/tests/format/junctions/options-inherit/target.bst
+++ b/tests/format/junctions/options-inherit/target.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- junction: base.bst
filename: target.bst
diff --git a/tests/format/junctions/options/target.bst b/tests/format/junctions/options/target.bst
index 8395c0c..23fd3e2 100644
--- a/tests/format/junctions/options/target.bst
+++ b/tests/format/junctions/options/target.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- junction: base.bst
filename: target.bst
diff --git a/tests/format/junctions/toplevel/target.bst b/tests/format/junctions/toplevel/target.bst
index 5e280e5..3d38ea6 100644
--- a/tests/format/junctions/toplevel/target.bst
+++ b/tests/format/junctions/toplevel/target.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- junction: foo.bst
filename: target.bst
- junction: bar.bst
diff --git a/tests/frontend/buildcheckout.py b/tests/frontend/buildcheckout.py
index d3eec0d..8f1b9f7 100644
--- a/tests/frontend/buildcheckout.py
+++ b/tests/frontend/buildcheckout.py
@@ -485,7 +485,7 @@ def test_unfetched_junction(cli, tmpdir, datafiles, ref_storage):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -534,7 +534,7 @@ def test_build_checkout_junction(cli, tmpdir, datafiles):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -581,7 +581,7 @@ def test_build_checkout_junction_default_targets(cli, tmpdir, datafiles):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -628,7 +628,7 @@ def test_build_checkout_workspaced_junction(cli, tmpdir, datafiles):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -710,7 +710,7 @@ def test_build_junction_short_notation(cli, tmpdir, datafiles):
# colon (:) as the separator
element = {
'kind': 'stack',
- 'depends': ['junction.bst:import-etc.bst']
+ 'runtime-depends': ['junction.bst:import-etc.bst']
}
_yaml.roundtrip_dump(element, element_path)
@@ -751,7 +751,7 @@ def test_build_junction_short_notation_filename(cli, tmpdir, datafiles):
# colon (:) as the separator
element = {
'kind': 'stack',
- 'depends': [{'filename': 'junction.bst:import-etc.bst'}]
+ 'runtime-depends': [{'filename': 'junction.bst:import-etc.bst'}]
}
_yaml.roundtrip_dump(element, element_path)
@@ -791,7 +791,7 @@ def test_build_junction_short_notation_with_junction(cli, tmpdir, datafiles):
# colon (:) as the separator
element = {
'kind': 'stack',
- 'depends': [{
+ 'runtime-depends': [{
'filename': 'junction.bst:import-etc.bst',
'junction': 'junction.bst',
}]
@@ -818,7 +818,7 @@ def test_build_junction_transitive_short_notation_with_junction(cli, tmpdir, dat
# colon (:) as the separator
element = {
'kind': 'stack',
- 'depends': ['junction.bst:import-etc.bst:foo.bst']
+ 'runtime-depends': ['junction.bst:import-etc.bst:foo.bst']
}
_yaml.roundtrip_dump(element, element_path)
diff --git a/tests/frontend/completions/no-element-path/target.bst b/tests/frontend/completions/no-element-path/target.bst
index b9432fa..639dc58 100644
--- a/tests/frontend/completions/no-element-path/target.bst
+++ b/tests/frontend/completions/no-element-path/target.bst
@@ -3,6 +3,6 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- import-bin.bst
- compose-all.bst
diff --git a/tests/frontend/completions/project/elements/target.bst b/tests/frontend/completions/project/elements/target.bst
index b9432fa..639dc58 100644
--- a/tests/frontend/completions/project/elements/target.bst
+++ b/tests/frontend/completions/project/elements/target.bst
@@ -3,6 +3,6 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- import-bin.bst
- compose-all.bst
diff --git a/tests/frontend/completions/sub-folders/elements/base.bst b/tests/frontend/completions/sub-folders/elements/base.bst
index 4e97e8a..ce0b64e 100644
--- a/tests/frontend/completions/sub-folders/elements/base.bst
+++ b/tests/frontend/completions/sub-folders/elements/base.bst
@@ -1,5 +1,5 @@
kind: stack
description: Base stack
-depends:
+runtime-depends:
- base/wanted.bst
diff --git a/tests/frontend/fetch.py b/tests/frontend/fetch.py
index 7ea357a..ff5afd8 100644
--- a/tests/frontend/fetch.py
+++ b/tests/frontend/fetch.py
@@ -105,7 +105,7 @@ def test_unfetched_junction(cli, tmpdir, datafiles, strict, ref_storage):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -155,7 +155,7 @@ def test_inconsistent_junction(cli, tmpdir, datafiles, ref_storage):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
diff --git a/tests/frontend/project/elements/invalid-chars-in-dep.bst b/tests/frontend/project/elements/invalid-chars-in-dep.bst
index 6a5ec30..17871a3 100644
--- a/tests/frontend/project/elements/invalid-chars-in-dep.bst
+++ b/tests/frontend/project/elements/invalid-chars-in-dep.bst
@@ -4,5 +4,5 @@ description: |
This element itself has a valid name, but depends on elements that have
invalid names. This should also result in a warning.
-depends:
+runtime-depends:
- invalid-chars|<>-in-name.bst
diff --git a/tests/frontend/project/elements/target.bst b/tests/frontend/project/elements/target.bst
index b9432fa..639dc58 100644
--- a/tests/frontend/project/elements/target.bst
+++ b/tests/frontend/project/elements/target.bst
@@ -3,6 +3,6 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- import-bin.bst
- compose-all.bst
diff --git a/tests/frontend/project/elements/target2.bst b/tests/frontend/project/elements/target2.bst
index 259819f..e9de33b 100644
--- a/tests/frontend/project/elements/target2.bst
+++ b/tests/frontend/project/elements/target2.bst
@@ -3,5 +3,5 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- target.foo
diff --git a/tests/frontend/project_fail/elements/target.bst b/tests/frontend/project_fail/elements/target.bst
index 154c477..6b3e6c3 100644
--- a/tests/frontend/project_fail/elements/target.bst
+++ b/tests/frontend/project_fail/elements/target.bst
@@ -3,5 +3,5 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- compose-all.bst
diff --git a/tests/frontend/project_world/elements/checkout-deps.bst b/tests/frontend/project_world/elements/checkout-deps.bst
index e3a5486..410f07a 100644
--- a/tests/frontend/project_world/elements/checkout-deps.bst
+++ b/tests/frontend/project_world/elements/checkout-deps.bst
@@ -1,7 +1,4 @@
kind: stack
-description: It is important for this element to have both build and runtime dependencies
-depends:
-- filename: import-dev.bst
- type: build
-- filename: import-bin.bst
- type: runtime
+runtime-depends:
+- import-dev.bst
+- import-bin.bst
diff --git a/tests/frontend/project_world/elements/target.bst b/tests/frontend/project_world/elements/target.bst
index b9432fa..639dc58 100644
--- a/tests/frontend/project_world/elements/target.bst
+++ b/tests/frontend/project_world/elements/target.bst
@@ -3,6 +3,6 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- import-bin.bst
- compose-all.bst
diff --git a/tests/frontend/track-cross-junction/subproject.bst b/tests/frontend/track-cross-junction/subproject.bst
index 0a9e5ab..a2be203 100644
--- a/tests/frontend/track-cross-junction/subproject.bst
+++ b/tests/frontend/track-cross-junction/subproject.bst
@@ -1,5 +1,5 @@
kind: stack
-depends:
+runtime-depends:
- filename: subtarget.bst
junction: subproject-junction.bst
diff --git a/tests/frontend/workspaced-build-dep/elements/stack.bst b/tests/frontend/workspaced-build-dep/elements/stack.bst
index b4c6002..a4a5093 100644
--- a/tests/frontend/workspaced-build-dep/elements/stack.bst
+++ b/tests/frontend/workspaced-build-dep/elements/stack.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- elem3.bst
diff --git a/tests/frontend/workspaced-runtime-dep/elements/stack.bst b/tests/frontend/workspaced-runtime-dep/elements/stack.bst
index b4c6002..a4a5093 100644
--- a/tests/frontend/workspaced-runtime-dep/elements/stack.bst
+++ b/tests/frontend/workspaced-runtime-dep/elements/stack.bst
@@ -1,4 +1,4 @@
kind: stack
-depends:
+runtime-depends:
- elem3.bst
diff --git a/tests/integration/project/elements/base.bst b/tests/integration/project/elements/base.bst
index 428afa7..1f72c50 100644
--- a/tests/integration/project/elements/base.bst
+++ b/tests/integration/project/elements/base.bst
@@ -1,5 +1,5 @@
# elements/base.bst
kind: stack
-depends:
+runtime-depends:
- base/base-alpine.bst
diff --git a/tests/integration/project/elements/stack/stack.bst b/tests/integration/project/elements/stack/stack.bst
index bbfc31a..c7b06ea 100644
--- a/tests/integration/project/elements/stack/stack.bst
+++ b/tests/integration/project/elements/stack/stack.bst
@@ -1,5 +1,5 @@
kind: stack
description: Stack test
-depends:
+runtime-depends:
- stack/hi.bst
- stack/another-hi.bst
diff --git a/tests/remoteexecution/project/elements/base.bst b/tests/remoteexecution/project/elements/base.bst
index 428afa7..1f72c50 100644
--- a/tests/remoteexecution/project/elements/base.bst
+++ b/tests/remoteexecution/project/elements/base.bst
@@ -1,5 +1,5 @@
# elements/base.bst
kind: stack
-depends:
+runtime-depends:
- base/base-alpine.bst
diff --git a/tests/remoteexecution/project/files/sub-project/elements/base.bst b/tests/remoteexecution/project/files/sub-project/elements/base.bst
index 428afa7..1f72c50 100644
--- a/tests/remoteexecution/project/files/sub-project/elements/base.bst
+++ b/tests/remoteexecution/project/files/sub-project/elements/base.bst
@@ -1,5 +1,5 @@
# elements/base.bst
kind: stack
-depends:
+runtime-depends:
- base/base-alpine.bst
diff --git a/tests/sandboxes/project/elements/base.bst b/tests/sandboxes/project/elements/base.bst
index 428afa7..1f72c50 100644
--- a/tests/sandboxes/project/elements/base.bst
+++ b/tests/sandboxes/project/elements/base.bst
@@ -1,5 +1,5 @@
# elements/base.bst
kind: stack
-depends:
+runtime-depends:
- base/base-alpine.bst
diff --git a/tests/sourcecache/project/elements/target.bst b/tests/sourcecache/project/elements/target.bst
index ba489f1..9141533 100644
--- a/tests/sourcecache/project/elements/target.bst
+++ b/tests/sourcecache/project/elements/target.bst
@@ -3,7 +3,7 @@ description: |
Main stack target for the bst build test
-depends:
+runtime-depends:
- import-bin.bst
- import-dev.bst
- compose-all.bst
diff --git a/tests/sources/local/deterministic-umask/elements/base.bst b/tests/sources/local/deterministic-umask/elements/base.bst
index 428afa7..1f72c50 100644
--- a/tests/sources/local/deterministic-umask/elements/base.bst
+++ b/tests/sources/local/deterministic-umask/elements/base.bst
@@ -1,5 +1,5 @@
# elements/base.bst
kind: stack
-depends:
+runtime-depends:
- base/base-alpine.bst
diff --git a/tests/sources/project/elements/base.bst b/tests/sources/project/elements/base.bst
index 428afa7..1f72c50 100644
--- a/tests/sources/project/elements/base.bst
+++ b/tests/sources/project/elements/base.bst
@@ -1,5 +1,5 @@
# elements/base.bst
kind: stack
-depends:
+runtime-depends:
- base/base-alpine.bst
[buildstream] 10/14: fixup! fixup! fixup! fixup! fixup! fixup!
fixup! tests: Remove build dependencies from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 2427c93c005ec377dc3987625507a4eb583ef70a
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 16:58:57 2019 +0100
fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
doc/examples/autotools/elements/base.bst | 2 +-
doc/examples/developing/elements/base.bst | 2 +-
doc/examples/flatpak-autotools/elements/base.bst | 2 +-
doc/examples/integration-commands/elements/base.bst | 2 +-
doc/examples/junctions/autotools/elements/base.bst | 2 +-
doc/examples/running-commands/elements/base.bst | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/examples/autotools/elements/base.bst b/doc/examples/autotools/elements/base.bst
index 1b85a9e..e717de8 100644
--- a/doc/examples/autotools/elements/base.bst
+++ b/doc/examples/autotools/elements/base.bst
@@ -1,5 +1,5 @@
kind: stack
description: Base stack
-depends:
+runtime-depends:
- base/alpine.bst
diff --git a/doc/examples/developing/elements/base.bst b/doc/examples/developing/elements/base.bst
index 1b85a9e..e717de8 100644
--- a/doc/examples/developing/elements/base.bst
+++ b/doc/examples/developing/elements/base.bst
@@ -1,5 +1,5 @@
kind: stack
description: Base stack
-depends:
+runtime-depends:
- base/alpine.bst
diff --git a/doc/examples/flatpak-autotools/elements/base.bst b/doc/examples/flatpak-autotools/elements/base.bst
index f1bc283..6b8ba02 100644
--- a/doc/examples/flatpak-autotools/elements/base.bst
+++ b/doc/examples/flatpak-autotools/elements/base.bst
@@ -1,6 +1,6 @@
kind: stack
description: Base stack
-depends:
+runtime-depends:
- base/sdk.bst
- base/usrmerge.bst
diff --git a/doc/examples/integration-commands/elements/base.bst b/doc/examples/integration-commands/elements/base.bst
index 1b85a9e..e717de8 100644
--- a/doc/examples/integration-commands/elements/base.bst
+++ b/doc/examples/integration-commands/elements/base.bst
@@ -1,5 +1,5 @@
kind: stack
description: Base stack
-depends:
+runtime-depends:
- base/alpine.bst
diff --git a/doc/examples/junctions/autotools/elements/base.bst b/doc/examples/junctions/autotools/elements/base.bst
index 1b85a9e..e717de8 100644
--- a/doc/examples/junctions/autotools/elements/base.bst
+++ b/doc/examples/junctions/autotools/elements/base.bst
@@ -1,5 +1,5 @@
kind: stack
description: Base stack
-depends:
+runtime-depends:
- base/alpine.bst
diff --git a/doc/examples/running-commands/elements/base.bst b/doc/examples/running-commands/elements/base.bst
index 1b85a9e..e717de8 100644
--- a/doc/examples/running-commands/elements/base.bst
+++ b/doc/examples/running-commands/elements/base.bst
@@ -1,5 +1,5 @@
kind: stack
description: Base stack
-depends:
+runtime-depends:
- base/alpine.bst
[buildstream] 05/14: fixup! fixup! tests: Remove build dependencies
from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 282001b7685c706917e095f461efcd56ed34b898
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 15:17:15 2019 +0100
fixup! fixup! tests: Remove build dependencies from stack elements
---
tests/frontend/show.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/frontend/show.py b/tests/frontend/show.py
index d173fd8..29c6376 100644
--- a/tests/frontend/show.py
+++ b/tests/frontend/show.py
@@ -245,7 +245,7 @@ def test_unfetched_junction(cli, tmpdir, datafiles, ref_storage, element_name, w
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -303,7 +303,7 @@ def test_inconsistent_junction(cli, tmpdir, datafiles, ref_storage, workspaced):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
@@ -359,7 +359,7 @@ def test_fetched_junction(cli, tmpdir, datafiles, element_name, workspaced):
#
element = {
'kind': 'stack',
- 'depends': [
+ 'runtime-depends': [
{
'junction': 'junction.bst',
'filename': 'import-etc.bst'
[buildstream] 11/14: fixup! fixup! fixup! fixup! fixup! fixup!
fixup! fixup! tests: Remove build dependencies from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 9bfc0aaa035a7dc9f47472d9062a905eed853a5d
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 17:41:51 2019 +0100
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
tests/format/dependencies1/elements/builddep-list.bst | 2 +-
tests/format/dependencies1/elements/list-combine.bst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/format/dependencies1/elements/builddep-list.bst b/tests/format/dependencies1/elements/builddep-list.bst
index a0cbcaf..49e1792 100644
--- a/tests/format/dependencies1/elements/builddep-list.bst
+++ b/tests/format/dependencies1/elements/builddep-list.bst
@@ -1,4 +1,4 @@
-kind: stack
+kind: manual
description: This element has a build-only dependency specified via build-depends
build-depends:
- firstdep.bst
diff --git a/tests/format/dependencies1/elements/list-combine.bst b/tests/format/dependencies1/elements/list-combine.bst
index 78ebdb6..d01293f 100644
--- a/tests/format/dependencies1/elements/list-combine.bst
+++ b/tests/format/dependencies1/elements/list-combine.bst
@@ -1,4 +1,4 @@
-kind: stack
+kind: manual
description: This element depends on three elements in different ways
build-depends:
- firstdep.bst
[buildstream] 13/14: fixup! fixup! fixup! fixup! fixup! fixup!
fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack
elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit ce398b8f89b30bbb012fddd424f78914f7ebd273
Author: Chandan Singh <ch...@chandansingh.net>
AuthorDate: Tue Jul 16 19:05:51 2019 +0100
fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
src/buildstream/testing/_sourcetests/track_cross_junction.py | 2 +-
tests/frontend/workspace.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/buildstream/testing/_sourcetests/track_cross_junction.py b/src/buildstream/testing/_sourcetests/track_cross_junction.py
index 31443bd..01ed6da 100644
--- a/src/buildstream/testing/_sourcetests/track_cross_junction.py
+++ b/src/buildstream/testing/_sourcetests/track_cross_junction.py
@@ -85,7 +85,7 @@ def generate_simple_stack(project, name, dependencies):
element_path = os.path.join(project, 'elements', element_name)
element = {
'kind': 'stack',
- 'depends': dependencies
+ 'runtime-depends': dependencies
}
_yaml.roundtrip_dump(element, element_path)
diff --git a/tests/frontend/workspace.py b/tests/frontend/workspace.py
index 6e23ec4..09708a7 100644
--- a/tests/frontend/workspace.py
+++ b/tests/frontend/workspace.py
@@ -1270,8 +1270,8 @@ TEST_DIR = os.path.join(
@pytest.mark.parametrize(
["case", "non_workspaced_elements_state"],
[
- ("workspaced-build-dep", ["waiting", "waiting", "waiting", "waiting", "waiting"]),
- ("workspaced-runtime-dep", ["buildable", "buildable", "waiting", "waiting", "waiting"])
+ ("workspaced-build-dep", ["waiting", "waiting", "buildable", "waiting", "waiting"]),
+ ("workspaced-runtime-dep", ["buildable", "buildable", "buildable", "waiting", "waiting"])
],
)
@pytest.mark.parametrize("strict", [("strict"), ("non-strict")])
[buildstream] 01/14: elements/stack.py: Forbid sources and build
dependencies
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit a2c9a6be0344426abe6ec7327949bcb1f11acd43
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 12:17:40 2019 +0100
elements/stack.py: Forbid sources and build dependencies
Since the `stack` plugin only cares about its runtime dependencies,
explicitly forbid build dependencies and sources from being specified to
avoid confusion.
Fixes #1075.
---
src/buildstream/plugins/elements/stack.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/buildstream/plugins/elements/stack.py b/src/buildstream/plugins/elements/stack.py
index 97517ca..4cacd3f 100644
--- a/src/buildstream/plugins/elements/stack.py
+++ b/src/buildstream/plugins/elements/stack.py
@@ -30,6 +30,12 @@ from buildstream import Element
# Element implementation for the 'stack' kind.
class StackElement(Element):
+ # This plugin ingores build dependencies, so disallow them
+ BST_FORBID_BDEPENDS = True
+
+ # This plugin ignores sources, so disallow them
+ BST_FORBID_SOURCES = True
+
# This plugin has been modified to avoid the use of Sandbox.get_directory
BST_VIRTUAL_DIRECTORY = True
[buildstream] 08/14: fixup! fixup! fixup! fixup! fixup! tests:
Remove build dependencies from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 4ded09501b16af4da88f12f377c31219ddbaa8f6
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 15:24:16 2019 +0100
fixup! fixup! fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
tests/frontend/track.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/frontend/track.py b/tests/frontend/track.py
index aabcbed..900eed0 100644
--- a/tests/frontend/track.py
+++ b/tests/frontend/track.py
@@ -324,7 +324,7 @@ def test_junction_element(cli, tmpdir, datafiles, ref_storage):
result.assert_success()
# Now assert element state (via bst show under the hood) of the dep again
- assert cli.get_element_state(project, 'junction-dep.bst') == 'waiting'
+ assert cli.get_element_state(project, 'junction-dep.bst') == 'buildable'
@pytest.mark.datafiles(DATA_DIR)
[buildstream] 06/14: fixup! fixup! fixup! tests: Remove build
dependencies from stack elements
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch chandan/stack-stricter-warnings
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit ab29699b520b1117a0d0dbbf5a79d846959fa17a
Author: Chandan Singh <cs...@bloomberg.net>
AuthorDate: Tue Jul 16 15:18:33 2019 +0100
fixup! fixup! fixup! tests: Remove build dependencies from stack elements
---
tests/frontend/show.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/frontend/show.py b/tests/frontend/show.py
index 29c6376..e627d30 100644
--- a/tests/frontend/show.py
+++ b/tests/frontend/show.py
@@ -334,7 +334,7 @@ def test_inconsistent_junction(cli, tmpdir, datafiles, ref_storage, workspaced):
else:
# Assert that we have the expected provenance encoded into the error
element_node = _yaml.load(element_path, shortname='junction-dep.bst')
- ref_node = element_node.get_sequence('depends').mapping_at(0)
+ ref_node = element_node.get_sequence('runtime-depends').mapping_at(0)
provenance = ref_node.get_provenance()
assert str(provenance) in dep_result.stderr