diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-14 17:52:38 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2012-11-14 17:58:39 +0000 |
commit | e8a342e61989f06172457fc25311abc02e5dfee6 (patch) | |
tree | 1cb80924d7cd49b495a4844419fd1669ce7eeafd /tests.as-root/setup | |
parent | 70564c6457b732e1dd35384971da5df3c5a1665b (diff) | |
download | morph-e8a342e61989f06172457fc25311abc02e5dfee6.tar.gz |
Update as-root tests to use their setup infrastructure
Code to generate system images was being duplicated in each test needlessly.
Diffstat (limited to 'tests.as-root/setup')
-rwxr-xr-x | tests.as-root/setup | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/tests.as-root/setup b/tests.as-root/setup index b7a273da..a69dd94e 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -125,6 +125,22 @@ cat <<EOF > hello-system.morph EOF git add hello-system.morph +cat <<EOF > linux-stratum.morph +{ + "name": "linux-stratum", + "kind": "stratum", + "chunks": [ + { + "name": "linux", + "repo": "test:kernel-repo", + "ref": "master", + "build-depends": [] + } + ] +} +EOF +git add linux-stratum.morph + cat <<EOF > linux-system.morph { "name": "linux-system", @@ -134,6 +150,11 @@ cat <<EOF > linux-system.morph "disk-size": "1G", "strata": [ { + "morph": "hello-stratum", + "repo": "test:morphs", + "ref": "master" + }, + { "morph": "linux-stratum", "repo": "test:morphs", "ref": "master" @@ -143,22 +164,6 @@ cat <<EOF > linux-system.morph EOF git add linux-system.morph -cat <<EOF > linux-stratum.morph -{ - "name": "linux-stratum", - "kind": "stratum", - "chunks": [ - { - "name": "linux", - "repo": "test:kernel-repo", - "ref": "master", - "build-depends": [] - } - ] -} -EOF -git add linux-stratum.morph - git commit --quiet -m "add morphs" # Make a dummy kernel chunk. |