Merge branch 'samthursfield/build-essential-2-rebase'

Conflicts:
	morphlib/bins_tests.py

Reviewed-By: consensus

4 files changed, 10 insertions, 2 deletions

diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script
index 2d5d0fed..fd021399 100755
--- a/tests.as-root/build-with-external-strata.script
+++ b/tests.as-root/build-with-external-strata.script
@@ -38,6 +38,7 @@ cat <<EOF >> stratum2.morph
             "name": "linux",
             "repo": "test:kernel-repo",
             "ref": "master",
+            "build-mode": "test",
             "build-depends": []
         }
     ]
diff --git a/tests.as-root/setup b/tests.as-root/setup
index 03a438e0..b9d5d477 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -110,6 +110,7 @@ chunks:
     - name: hello
       repo: test:chunk-repo
       ref: farrokh
+      build-mode: test
       build-depends: []
 EOF
 git add hello-stratum.morph
@@ -125,6 +126,7 @@ chunks:
     - name: tools
       repo: test:tools-repo
       ref: master
+      build-mode: test
       build-depends: []
 EOF
 git add tools-stratum.morph
@@ -153,6 +155,7 @@ chunks:
     - name: linux
       repo: test:kernel-repo
       ref: master
+      build-mode: test
       build-depends: []
 EOF
 git add linux-stratum.morph
@@ -200,7 +203,6 @@ cat <<EOF > "$DATADIR/morph.conf"
 repo-alias = test=file://$DATADIR/#file://$DATADIR/
 cachedir = $DATADIR/cache
 log = $DATADIR/morph.log
-keep-path = true
 no-distcc = true
 quiet = true
 log = /tmp/morph.log
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index cc308536..b8888491 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Codethink Limited
+# Copyright (C) 2011-2013  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -57,12 +57,14 @@ cat <<EOF >foo-baz-stratum.morph
       "name": "overlap-foo-baz",
       "repo": "test:chunk-repo",
       "ref": "overlap",
+      "build-mode": "test",
       "build-depends": []
     },
     {
       "name": "linux",
       "repo": "test:kernel-repo",
       "ref": "master",
+      "build-mode": "test",
       "build-depends": ["overlap-foo-baz"]
     }
   ]
@@ -77,12 +79,14 @@ cat <<EOF >foo-barqux-stratum.morph
       "name": "overlap-foobar",
       "repo": "test:chunk-repo",
       "ref": "overlap",
+      "build-mode": "test",
       "build-depends": []
     },
     {
       "name": "overlap-fooqux",
       "repo": "test:chunk-repo",
       "ref": "overlap",
+      "build-mode": "test",
       "build-depends": ["overlap-foobar"]
     }
   ]
diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup
index e159070c..fa904c2c 100755
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ b/tests.as-root/tarball-image-is-sensible.setup
@@ -84,6 +84,7 @@ cat <<EOF > link-stratum.morph
             "name": "links",
             "repo": "test:chunk-repo",
             "ref": "tarball-links",
+            "build-mode": "test",
             "build-depends": []
         }
     ]