summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-06-29 12:00:42 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-06-29 12:00:42 +0100
commit037aadafa59ed46ddac4a9c76d6a1f495cc44a12 (patch)
tree40e7219a08956523be581e636619ac7a8a581ce9 /tests
parent0029fee3e447d576cbcde8025fbba91eddc31892 (diff)
parentfee76889e3c5634bc759ed6c9b7056dc10b71a4c (diff)
downloadmorph-037aadafa59ed46ddac4a9c76d6a1f495cc44a12.tar.gz
Merge branch 'liw/remove-implicit-build-depends' of roadtrain.codethink.co.uk:baserock/morph
Diffstat (limited to 'tests')
-rwxr-xr-xtests/build-stratum-with-submodules.script3
-rwxr-xr-xtests/morphless-chunks.script3
-rwxr-xr-xtests/setup3
-rwxr-xr-xtests/stratum-overlap-warns.setup12
4 files changed, 14 insertions, 7 deletions
diff --git a/tests/build-stratum-with-submodules.script b/tests/build-stratum-with-submodules.script
index 7d44caf6..c2d97817 100755
--- a/tests/build-stratum-with-submodules.script
+++ b/tests/build-stratum-with-submodules.script
@@ -53,7 +53,8 @@ cat <<EOF > "$morphs/submod-stratum.morph"
{
"name": "parent",
"repo": "test:parent-repo",
- "ref": "master"
+ "ref": "master",
+ "build-depends": []
}
]
}
diff --git a/tests/morphless-chunks.script b/tests/morphless-chunks.script
index 584a4e09..956bd7c1 100755
--- a/tests/morphless-chunks.script
+++ b/tests/morphless-chunks.script
@@ -48,7 +48,8 @@ cat << EOF > alfred.morph
{
"name": "morphless",
"repo": "test:morphless",
- "ref": "master"
+ "ref": "master",
+ "build-depends": []
}
]
}
diff --git a/tests/setup b/tests/setup
index 5a6668a3..179502f8 100755
--- a/tests/setup
+++ b/tests/setup
@@ -94,7 +94,8 @@ cat <<EOF > hello-stratum.morph
{
"name": "hello",
"repo": "test:chunk-repo",
- "ref": "farrokh"
+ "ref": "farrokh",
+ "build-depends": []
}
]
}
diff --git a/tests/stratum-overlap-warns.setup b/tests/stratum-overlap-warns.setup
index 94aed05a..4dff3ddb 100755
--- a/tests/stratum-overlap-warns.setup
+++ b/tests/stratum-overlap-warns.setup
@@ -33,22 +33,26 @@ cat <<EOF >overlap-stratum.morph
{
"name": "dirs",
"repo": "test:chunk-repo",
- "ref": "overlap"
+ "ref": "overlap",
+ "build-depends": []
},
{
"name": "overlap-foobar",
"repo": "test:chunk-repo",
- "ref": "overlap"
+ "ref": "overlap",
+ "build-depends": ["dirs"]
},
{
"name": "overlap-fooqux",
"repo": "test:chunk-repo",
- "ref": "overlap"
+ "ref": "overlap",
+ "build-depends": ["overlap-foobar"]
},
{
"name": "overlap-foo-baz",
"repo": "test:chunk-repo",
- "ref": "overlap"
+ "ref": "overlap",
+ "build-depends": ["overlap-fooqux"]
}
]
}