Merge branch 'tristan/dependency-config' into 'master'

Implement Element.configure_dependencies()

See merge request BuildStream/buildstream!2032

8 files changed, 36 insertions, 42 deletions

diff --git a/tests/integration/project/elements/manual/import-file.bst b/tests/integration/project/elements/manual/import-file.bst
new file mode 100644
index 000000000..195841951
--- /dev/null
+++ b/tests/integration/project/elements/manual/import-file.bst
@@ -0,0 +1,5 @@
+kind: import
+
+sources:
+- kind: local
+  path: files/import-source
diff --git a/tests/integration/project/elements/manual/manual-stage-custom.bst b/tests/integration/project/elements/manual/manual-stage-custom.bst
new file mode 100644
index 000000000..abd29c88a
--- /dev/null
+++ b/tests/integration/project/elements/manual/manual-stage-custom.bst
@@ -0,0 +1,13 @@
+kind: manual
+
+depends:
+- base.bst
+
+build-depends:
+- filename: manual/import-file.bst
+  config:
+    location: /flying-ponies
+
+config:
+  install-commands:
+  - cp /flying-ponies/subdir/test.txt %{install-root}
diff --git a/tests/integration/project/elements/script/corruption-2.bst b/tests/integration/project/elements/script/corruption-2.bst
index 39c4f2c23..75c5e92d0 100644
--- a/tests/integration/project/elements/script/corruption-2.bst
+++ b/tests/integration/project/elements/script/corruption-2.bst
@@ -1,10 +1,8 @@
 kind: script
 
-depends:
-- filename: base.bst
-  type: build
-- filename: script/corruption-image.bst
-  type: build
+build-depends:
+- base.bst
+- script/corruption-image.bst
 
 config:
   commands:
diff --git a/tests/integration/project/elements/script/corruption.bst b/tests/integration/project/elements/script/corruption.bst
index 037d4daca..841a2dd69 100644
--- a/tests/integration/project/elements/script/corruption.bst
+++ b/tests/integration/project/elements/script/corruption.bst
@@ -1,21 +1,9 @@
 kind: script
 
-depends:
-- filename: base.bst
-  type: build
-- filename: script/corruption-image.bst
-  type: build
-- filename: script/corruption-integration.bst
-  type: build
+build-depends:
+- base.bst
+- script/corruption-image.bst
+- script/corruption-integration.bst
 
 variables:
   install-root: "/"
-
-config:
-  layout:
-  - element: base.bst
-    destination: "/"
-  - element: script/corruption-image.bst
-    destination: "/"
-  - element: script/corruption-integration.bst
-    destination: "/"
diff --git a/tests/integration/project/elements/script/marked-tmpdir.bst b/tests/integration/project/elements/script/marked-tmpdir.bst
index 506cdd5f4..7abbd3261 100644
--- a/tests/integration/project/elements/script/marked-tmpdir.bst
+++ b/tests/integration/project/elements/script/marked-tmpdir.bst
@@ -1,8 +1,7 @@
 kind: compose
 
-depends:
-- filename: base.bst
-  type: build
+build-depends:
+- base.bst
 
 public:
   bst:
diff --git a/tests/integration/project/elements/script/script-layout.bst b/tests/integration/project/elements/script/script-layout.bst
index 11ca353e3..f19b27e52 100644
--- a/tests/integration/project/elements/script/script-layout.bst
+++ b/tests/integration/project/elements/script/script-layout.bst
@@ -5,19 +5,12 @@ variables:
   install-root: /buildstream/nstall
   build-root: /buildstream/uild
 
-depends:
-  - filename: base.bst
-    type: build
+build-depends:
+  - base.bst
   - filename: script/script.bst
-    type: build
+    config:
+      location: /buildstream/uild
 
 config:
-  layout:
-    - element: base.bst
-      destination: /
-
-    - element: script/script.bst
-      destination: /buildstream/uild
-
   commands:
-    - "cp %{build-root}/test %{install-root}"
+  - "cp %{build-root}/test %{install-root}"
diff --git a/tests/integration/project/elements/script/script.bst b/tests/integration/project/elements/script/script.bst
index ffca23ab7..3f3eb55c7 100644
--- a/tests/integration/project/elements/script/script.bst
+++ b/tests/integration/project/elements/script/script.bst
@@ -1,9 +1,8 @@
 kind: script
 description: Script test
 
-depends:
-  - filename: base.bst
-    type: build
+build-depends:
+- base.bst
 
 config:
   commands:
diff --git a/tests/integration/project/elements/script/tmpdir.bst b/tests/integration/project/elements/script/tmpdir.bst
index 685a694ea..5fbf55dc9 100644
--- a/tests/integration/project/elements/script/tmpdir.bst
+++ b/tests/integration/project/elements/script/tmpdir.bst
@@ -1,8 +1,7 @@
 kind: script
 
-depends:
-- filename: script/no-tmpdir.bst
-  type: build
+build-depends:
+- script/no-tmpdir.bst
 
 config:
   commands: