From e673826fbab90b1bb3b1b93277cab0e489fec190 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Date: Thu, 28 Jun 2012 16:10:39 +0100
Subject: Add check for missing build depends in strata

This will make a build fail if the morphology is missing explicit
build dependencies.

Also fix test causes so that ./check passes.
---
 tests.as-root/arm-system-writes-kernel.script |  6 ++++--
 tests.as-root/make-patch.script               |  6 ++++--
 tests.as-root/setup                           |  3 ++-
 tests.as-root/system-overlap.script           | 12 ++++++++----
 4 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'tests.as-root')

diff --git a/tests.as-root/arm-system-writes-kernel.script b/tests.as-root/arm-system-writes-kernel.script
index 500cedba..2a837af4 100755
--- a/tests.as-root/arm-system-writes-kernel.script
+++ b/tests.as-root/arm-system-writes-kernel.script
@@ -45,12 +45,14 @@ cat <<EOF >arm-stratum.morph
     {
       "name": "hello",
       "repo": "test:chunk-repo",
-      "ref": "farrokh"
+      "ref": "farrokh",
+      "build-depends": []
     },
     {
       "name": "linux",
       "repo": "test:kernel-repo",
-      "ref": "arm"
+      "ref": "arm",
+      "build-depends": ["hello"]
     }
   ]
 }
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script
index d312cb55..b5385fc0 100755
--- a/tests.as-root/make-patch.script
+++ b/tests.as-root/make-patch.script
@@ -28,12 +28,14 @@ cat <<EOF > "$DATADIR/morphs-repo/hello-stratum.morph"
         {
             "name": "hello",
             "repo": "test:chunk-repo",
-            "ref": "farrokh"
+            "ref": "farrokh",
+            "build-depends": []
         },
         {
             "name": "linux",
             "repo": "test:kernel-repo",
-            "ref": "master"
+            "ref": "master",
+            "build-depends": ["hello"]
         }
     ]
 }
diff --git a/tests.as-root/setup b/tests.as-root/setup
index 1d32b14d..2ee2d7fa 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/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.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 71b55e24..b6e3238e 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -45,12 +45,14 @@ cat <<EOF >foo-baz-stratum.morph
     {
       "name": "overlap-foo-baz",
       "repo": "test:chunk-repo",
-      "ref": "overlap"
+      "ref": "overlap",
+      "build-depends": []
     },
     {
       "name": "linux",
       "repo": "test:kernel-repo",
-      "ref": "master"
+      "ref": "master",
+      "build-depends": ["overlap-foo-baz"]
     }
   ]
 }
@@ -63,12 +65,14 @@ cat <<EOF >foo-barqux-stratum.morph
     {
       "name": "overlap-foobar",
       "repo": "test:chunk-repo",
-      "ref": "overlap"
+      "ref": "overlap",
+      "build-depends": []
     },
     {
       "name": "overlap-fooqux",
       "repo": "test:chunk-repo",
-      "ref": "overlap"
+      "ref": "overlap",
+      "build-depends": ["overlap-foobar"]
     }
   ]
 }
-- 
cgit v1.2.1