summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2012-12-18 17:22:43 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2012-12-18 17:22:43 +0000
commit7fa6d783190a7f2283b7799f6cc1409172020758 (patch)
tree63f25059a641a52aed42d16280d5f33d73f28208 /tests.as-root
parent363c85d76402df806886b7f0ca434dee604d862b (diff)
downloadmorph-7fa6d783190a7f2283b7799f6cc1409172020758.tar.gz
Add a stratum build-dependency to all as-root tests
Diffstat (limited to 'tests.as-root')
-rwxr-xr-xtests.as-root/setup7
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.setup6
2 files changed, 13 insertions, 0 deletions
diff --git a/tests.as-root/setup b/tests.as-root/setup
index a69dd94e..d3ba7ef4 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -129,6 +129,13 @@ cat <<EOF > linux-stratum.morph
{
"name": "linux-stratum",
"kind": "stratum",
+ "build-depends": [
+ {
+ "morph": "hello-stratum",
+ "repo": "test:morphs",
+ "ref": "master"
+ }
+ ],
"chunks": [
{
"name": "linux",
diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup
index 322038ba..c1c88993 100755
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ b/tests.as-root/tarball-image-is-sensible.setup
@@ -69,6 +69,12 @@ cat <<EOF > hello-tarball.morph
EOF
git add hello-tarball.morph
+# Change build-depends ref of hello-stratum from master to tarball-links
+sed -i linux-stratum.morph \
+ -e '/"build-depends": \[/,/\]/ s/"ref": "master"/"ref": "tarball-links"/'
+
+git add linux-stratum.morph
+
cat <<EOF > link-stratum.morph
{
"name": "link-stratum",