Update as-root tests to use their setup infrastructure

Code to generate system images was being duplicated in each test needlessly.

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.