This name makes gives slightly more of a clue as to its use case.
In future it may be better to make release building be a mode of the
normal 'build' commands, rather than be separate commands.
---
morphlib/buildbranch.py | 2 +-
morphlib/plugins/build_plugin.py | 13 +--
tests.as-root/archless-system-fails.script | 4 +-
tests.as-root/branch-from-image-works.script | 2 +-
.../metadata-includes-morph-version.script | 4 +-
tests.as-root/metadata-includes-repo-alias.script | 2 +-
.../rootfs-tarball-builds-rootfs-and-kernel.script | 2 +-
.../run-in-artifact-propagates-exit-code.script | 4 +-
...run-in-artifact-with-different-artifacts.script | 2 +-
tests.as-root/system-overlap.script | 2 +-
tests.as-root/tarball-image-is-sensible.script | 4 +-
tests.build/ambiguous-refs.script | 4 +-
tests.build/build-chunk-failures-dump-log.script | 4 +-
tests.build/build-chunk-writes-log.script | 4 +-
tests.build/build-stratum-with-submodules.script | 2 +-
...-system-autotools-fails-if-autogen-fails.script | 4 +-
tests.build/build-system-autotools.script | 2 +-
tests.build/build-system-cmake.script | 2 +-
tests.build/build-system-cpan.script | 2 +-
tests.build/build-system-python-distutils.script | 2 +-
tests.build/build-system-qmake.script | 4 +-
tests.build/build-system.script | 2 +-
tests.build/empty-stratum.script | 4 +-
tests.build/missing-ref.script | 4 +-
tests.build/morphless-chunks.script | 2 +-
tests.build/only-build-systems.script | 6 +-
tests.build/prefix.script | 2 +-
tests.build/rebuild-cached-stratum.script | 4 +-
tests.build/stratum-overlap-warns.script | 4 +-
tests.build/stratum-overlap-writes-overlap.script | 2 +-
tests.build/stratum-overlap-writes-overlap.setup | 123 ++++++++++++++++++++-
tests.build/uses-tempdir.script | 4 +-
32 files changed, 174 insertions(+), 54 deletions(-)
mode change 120000 => 100755 tests.build/stratum-overlap-writes-overlap.setup
diff --git a/morphlib/buildbranch.py b/morphlib/buildbranch.py
index d415e7e..da52a20 100644
--- a/morphlib/buildbranch.py
+++ b/morphlib/buildbranch.py
@@ -47,7 +47,7 @@ class BuildBranch(object):
# TODO: This currently always uses the temporary build ref. It
# would be better to not use local repositories and temporary refs,
# so building from a workspace appears to be identical to using
- # `morph build-morphology`
+ # `morph build-release`
def __init__(self, sb, build_ref_prefix, push_temporary):
self._sb = sb
diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py
index fb7efa5..5738357 100644
--- a/morphlib/plugins/build_plugin.py
+++ b/morphlib/plugins/build_plugin.py
@@ -24,12 +24,11 @@ import morphlib
class BuildPlugin(cliapp.Plugin):
def enable(self):
- self.app.add_subcommand('build-morphology', self.build_morphology,
+ self.app.add_subcommand('build-release', self.build_release,
arg_synopsis='(REPO REF FILENAME)...')
self.app.add_subcommand('build', self.build,
arg_synopsis='SYSTEM')
- self.app.add_subcommand('distbuild-morphology',
- self.distbuild_morphology,
+ self.app.add_subcommand('distbuild-release', self.distbuild_release,
arg_synopsis='SYSTEM')
self.app.add_subcommand('distbuild', self.distbuild,
arg_synopsis='SYSTEM')
@@ -38,7 +37,7 @@ class BuildPlugin(cliapp.Plugin):
def disable(self):
self.use_distbuild = False
- def distbuild_morphology(self, args):
+ def distbuild_release(self, args):
'''Distbuild a system, outside of a system branch.
Command line arguments:
@@ -47,7 +46,7 @@ class BuildPlugin(cliapp.Plugin):
* `REF` is a branch or other commit reference in that repository.
* `FILENAME` is a morphology filename at that ref.
- See 'help distbuild' and 'help build-morphology' for more
information.
+ See 'help distbuild' and 'help build-release' for more
information.
'''
@@ -83,7 +82,7 @@ class BuildPlugin(cliapp.Plugin):
self.use_distbuild = True
self.build(args)
- def build_morphology(self, args):
+ def build_release(self, args):
'''Build a system, outside of a system branch.
Command line arguments:
@@ -103,7 +102,7 @@ class BuildPlugin(cliapp.Plugin):
Example:
- morph build-morphology baserock:baserock/morphs \
+ morph build-release baserock:baserock/morphs \
master devel-system-x86_64-generic
'''
diff --git a/tests.as-root/archless-system-fails.script
b/tests.as-root/archless-system-fails.script
index 2fdeb01..392178c 100755
--- a/tests.as-root/archless-system-fails.script
+++ b/tests.as-root/archless-system-fails.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -39,4 +39,4 @@ git add archless-system.morph
git commit --quiet -m "add archless system"
"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs archless archless-system
+ build-release test:morphs archless archless-system
diff --git a/tests.as-root/branch-from-image-works.script
b/tests.as-root/branch-from-image-works.script
index fb0b09c..21259fa 100755
--- a/tests.as-root/branch-from-image-works.script
+++ b/tests.as-root/branch-from-image-works.script
@@ -26,7 +26,7 @@ set -eu
. "$SRCDIR/scripts/fix-committer-info"
tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
- build-morphology test:morphs tarball hello-tarball)
+ build-release test:morphs tarball hello-tarball)
extracted="$DATADIR/extracted"
mkdir -p "$extracted"
diff --git a/tests.as-root/metadata-includes-morph-version.script
b/tests.as-root/metadata-includes-morph-version.script
index f83712a..ae74f66 100755
--- a/tests.as-root/metadata-includes-morph-version.script
+++ b/tests.as-root/metadata-includes-morph-version.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2013 Codethink Limited
+# Copyright (C) 2014 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
@@ -34,7 +34,7 @@ tree="$(git rev-parse 'HEAD^{tree}')"
ref="$(git rev-parse --symbolic-full-name 'HEAD')"
tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
- build-morphology test:morphs tarball hello-tarball)
+ build-release test:morphs tarball hello-tarball)
extracted="$DATADIR/extracted"
mkdir -p "$extracted"
diff --git a/tests.as-root/metadata-includes-repo-alias.script
b/tests.as-root/metadata-includes-repo-alias.script
index 9e4a5d9..97256b8 100755
--- a/tests.as-root/metadata-includes-repo-alias.script
+++ b/tests.as-root/metadata-includes-repo-alias.script
@@ -30,7 +30,7 @@ set -eu
cd "$SRCDIR"
tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
- build-morphology test:morphs tarball hello-tarball)
+ build-release test:morphs tarball hello-tarball)
extracted="$DATADIR/extracted"
mkdir -p "$extracted"
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index e082996..0b090d7 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -40,7 +40,7 @@ git add linux.morph
git commit --quiet -m 'Make the kernel create a dummy zImage'
"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs master linux-system > /dev/null
+ build-release test:morphs master linux-system > /dev/null
for suffix in kernel rootfs
do
diff --git a/tests.as-root/run-in-artifact-propagates-exit-code.script
b/tests.as-root/run-in-artifact-propagates-exit-code.script
index d815c73..9b9c0d7 100755
--- a/tests.as-root/run-in-artifact-propagates-exit-code.script
+++ b/tests.as-root/run-in-artifact-propagates-exit-code.script
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 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
@@ -23,7 +23,7 @@ set -eu
. "$SRCDIR/tests.as-root/lib"
# Build first image. Remember the stratum.
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs master linux-system
system=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name
'*.system.*-rootfs')
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.script
b/tests.as-root/run-in-artifact-with-different-artifacts.script
index 57d408e..65f12d1 100755
--- a/tests.as-root/run-in-artifact-with-different-artifacts.script
+++ b/tests.as-root/run-in-artifact-with-different-artifacts.script
@@ -23,7 +23,7 @@ set -eu
. "$SRCDIR/tests.as-root/lib"
# Build first image. Remember the stratum.
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs master linux-system
system=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name
'*.system.*-rootfs')
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 1ce8379..90a2044 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -131,7 +131,7 @@ git add overlap-*.morph
git commit --quiet -m 'Add overlapping chunks'
"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs overlap overlap-system > /dev/null
+ build-release test:morphs overlap overlap-system > /dev/null
"$SRCDIR/scripts/list-overlaps" groups \
"$cache"/*.system.overlap-system*.overlaps |
while IFS='\n' read overlaps; do
diff --git a/tests.as-root/tarball-image-is-sensible.script
b/tests.as-root/tarball-image-is-sensible.script
index 0fb6d9b..a48050e 100755
--- a/tests.as-root/tarball-image-is-sensible.script
+++ b/tests.as-root/tarball-image-is-sensible.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 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
@@ -27,7 +27,7 @@ set -eu
. "$SRCDIR/scripts/fix-committer-info"
tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
- build-morphology test:morphs tarball-links hello-tarball)
+ build-release test:morphs tarball-links hello-tarball)
# Verify that the tar archive is not compressed.
if gunzip -t "$tar" > /dev/null
diff --git a/tests.build/ambiguous-refs.script b/tests.build/ambiguous-refs.script
index e1eae59..9434b97 100755
--- a/tests.build/ambiguous-refs.script
+++ b/tests.build/ambiguous-refs.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -28,5 +28,5 @@ git checkout -q -b alpha/master
git rm -q hello-system.morph
git commit -q -m "This ref will not build correctly"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
diff --git a/tests.build/build-chunk-failures-dump-log.script
b/tests.build/build-chunk-failures-dump-log.script
index e5c7c38..c652dbd 100755
--- a/tests.build/build-chunk-failures-dump-log.script
+++ b/tests.build/build-chunk-failures-dump-log.script
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -38,5 +38,5 @@ EOF
git add hello.morph
git commit --quiet -m "Make morphology fail to build."
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system 2>/dev/null
diff --git a/tests.build/build-chunk-writes-log.script
b/tests.build/build-chunk-writes-log.script
index 5bfb2ae..5536cd5 100755
--- a/tests.build/build-chunk-writes-log.script
+++ b/tests.build/build-chunk-writes-log.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -20,7 +20,7 @@
set -eu
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
SOURCES="$DATADIR/cached-sources"
diff --git a/tests.build/build-stratum-with-submodules.script
b/tests.build/build-stratum-with-submodules.script
index c996e76..3e6104a 100755
--- a/tests.build/build-stratum-with-submodules.script
+++ b/tests.build/build-stratum-with-submodules.script
@@ -67,7 +67,7 @@ EOF
# Now build and verify we got a stratum.
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
system=$(ls "$DATADIR/cache/artifacts/"*hello-system-rootfs)
diff --git a/tests.build/build-system-autotools-fails-if-autogen-fails.script
b/tests.build/build-system-autotools-fails-if-autogen-fails.script
index d7fdd05..39fe583 100755
--- a/tests.build/build-system-autotools-fails-if-autogen-fails.script
+++ b/tests.build/build-system-autotools-fails-if-autogen-fails.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2012-2013 Codethink Limited
+# Copyright (C) 2012-2014 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
@@ -35,7 +35,7 @@ git add autogen.sh
git rm -q hello.morph
git commit -q -m "Convert hello to a broken autotools project"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system \
/dev/null 2> /dev/null
diff --git a/tests.build/build-system-autotools.script
b/tests.build/build-system-autotools.script
index ba5cd32..851e021 100755
--- a/tests.build/build-system-autotools.script
+++ b/tests.build/build-system-autotools.script
@@ -47,7 +47,7 @@ EOF
git add hello.morph
git commit --quiet -m "Convert hello to an autotools project"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
for chunk in "$DATADIR/cache/artifacts/"*.chunk.*
diff --git a/tests.build/build-system-cmake.script
b/tests.build/build-system-cmake.script
index ab5186d..e5d50a0 100755
--- a/tests.build/build-system-cmake.script
+++ b/tests.build/build-system-cmake.script
@@ -48,7 +48,7 @@ EOF
git add hello.morph
git commit --quiet -m "Convert hello to a cmake project"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
for chunk in "$DATADIR/cache/artifacts/"*.chunk.*
diff --git a/tests.build/build-system-cpan.script b/tests.build/build-system-cpan.script
index f66d402..f47e814 100755
--- a/tests.build/build-system-cpan.script
+++ b/tests.build/build-system-cpan.script
@@ -76,7 +76,7 @@ git add hello-stratum.morph
git commit -q -m "Set custom install prefix for hello"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
for chunk in "$DATADIR/cache/artifacts/"*.chunk.*
diff --git a/tests.build/build-system-python-distutils.script
b/tests.build/build-system-python-distutils.script
index e1dccb4..4514b50 100755
--- a/tests.build/build-system-python-distutils.script
+++ b/tests.build/build-system-python-distutils.script
@@ -74,7 +74,7 @@ git add hello-stratum.morph
git commit -q -m "Set custom install prefix for hello"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
for chunk in "$DATADIR/cache/artifacts/"*.chunk.*
diff --git a/tests.build/build-system-qmake.script
b/tests.build/build-system-qmake.script
index d9e21fb..83faa02 100755
--- a/tests.build/build-system-qmake.script
+++ b/tests.build/build-system-qmake.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -56,7 +56,7 @@ EOF
git add hello.morph
git commit --quiet -m "Convert hello to an qmake project"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
for chunk in "$DATADIR/cache/artifacts/"*.chunk.*
diff --git a/tests.build/build-system.script b/tests.build/build-system.script
index 56d8073..15b6eab 100755
--- a/tests.build/build-system.script
+++ b/tests.build/build-system.script
@@ -20,7 +20,7 @@
set -eu
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
system=$(ls "$DATADIR/cache/artifacts/"*hello-system-rootfs)
diff --git a/tests.build/empty-stratum.script b/tests.build/empty-stratum.script
index 6856b2b..b66987f 100755
--- a/tests.build/empty-stratum.script
+++ b/tests.build/empty-stratum.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2013 Codethink Limited
+# Copyright (C) 2014 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
@@ -34,5 +34,5 @@ git add hello-stratum.morph hello-system.morph
git commit --quiet -m "add empty stratum"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo empty-stratum hello-system
diff --git a/tests.build/missing-ref.script b/tests.build/missing-ref.script
index a18ce2d..2af0cbb 100755
--- a/tests.build/missing-ref.script
+++ b/tests.build/missing-ref.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -18,6 +18,6 @@
## Test building with a bad reference.
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo non-existent-branch hello-system
diff --git a/tests.build/morphless-chunks.script b/tests.build/morphless-chunks.script
index 9a8b41d..5029d12 100755
--- a/tests.build/morphless-chunks.script
+++ b/tests.build/morphless-chunks.script
@@ -39,7 +39,7 @@ git add Makefile configure
git commit -q -m "Convert hello into an autodetectable chunk"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
for chunk in "$DATADIR/cache/artifacts/"*.chunk.*
diff --git a/tests.build/only-build-systems.script
b/tests.build/only-build-systems.script
index 699be94..b5f59f3 100755
--- a/tests.build/only-build-systems.script
+++ b/tests.build/only-build-systems.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2013 Codethink Limited
+# Copyright (C) 2014 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
@@ -21,9 +21,9 @@
set -eu
-! "$SRCDIR/scripts/test-morph" build-morphology \
+! "$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-stratum
-! "$SRCDIR/scripts/test-morph" build-morphology \
+! "$SRCDIR/scripts/test-morph" build-release \
test:chunk-repo farrokh hello
diff --git a/tests.build/prefix.script b/tests.build/prefix.script
index ca9648c..341428c 100755
--- a/tests.build/prefix.script
+++ b/tests.build/prefix.script
@@ -78,7 +78,7 @@ EOF
git add hello-stratum.morph
git commit -q -m "Update stratum"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo master hello-system
cd "$DATADIR/cache/artifacts"
diff --git a/tests.build/rebuild-cached-stratum.script
b/tests.build/rebuild-cached-stratum.script
index 0014e54..c20bf92 100755
--- a/tests.build/rebuild-cached-stratum.script
+++ b/tests.build/rebuild-cached-stratum.script
@@ -39,7 +39,7 @@ cache="$DATADIR/cache/artifacts"
git commit --quiet -m "rebuild-cached-stratum" -a)
# Build the first time.
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo rebuild-cached-stratum hello-system
echo "first build:"
(cd "$cache" && ls *.chunk.* *hello-stratum-* | sed 's/^[^.]*\./
/' |
@@ -51,7 +51,7 @@ echo "first build:"
git commit --quiet -am change)
# Rebuild.
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo rebuild-cached-stratum hello-system
echo "second build:"
(cd "$cache" && ls *.chunk.* *hello-stratum-* | sed 's/^[^.]*\./
/' |
diff --git a/tests.build/stratum-overlap-warns.script
b/tests.build/stratum-overlap-warns.script
index 2a3b06e..66bc2f0 100755
--- a/tests.build/stratum-overlap-warns.script
+++ b/tests.build/stratum-overlap-warns.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -29,7 +29,7 @@ warning_mentions(){
grep -F "$1" <"$warnings" >/dev/null 2>/dev/null
}
-"$SRCDIR/scripts/test-morph" build-morphology --log=$log \
+"$SRCDIR/scripts/test-morph" build-release --log=$log \
test:morphs-repo overlap hello-system > /dev/null
grep WARNING "$log" >"$warnings"
for str in hello-stratum \
diff --git a/tests.build/stratum-overlap-writes-overlap.script
b/tests.build/stratum-overlap-writes-overlap.script
index fe4ed4e..7868898 100755
--- a/tests.build/stratum-overlap-writes-overlap.script
+++ b/tests.build/stratum-overlap-writes-overlap.script
@@ -24,7 +24,7 @@ set -eu
cache="$DATADIR/cache/artifacts"
-"$SRCDIR/scripts/test-morph" build-morphology \
+"$SRCDIR/scripts/test-morph" build-release \
test:morphs-repo overlap hello-system > /dev/null
"$SRCDIR/scripts/list-overlaps" groups \
"$cache"/*.stratum.hello-stratum-*.overlaps |
diff --git a/tests.build/stratum-overlap-writes-overlap.setup
b/tests.build/stratum-overlap-writes-overlap.setup
deleted file mode 120000
index 255e9a7..0000000
--- a/tests.build/stratum-overlap-writes-overlap.setup
+++ /dev/null
@@ -1 +0,0 @@
-stratum-overlap-warns.setup
\ No newline at end of file
diff --git a/tests.build/stratum-overlap-writes-overlap.setup
b/tests.build/stratum-overlap-writes-overlap.setup
new file mode 100755
index 0000000..5ebd217
--- /dev/null
+++ b/tests.build/stratum-overlap-writes-overlap.setup
@@ -0,0 +1,122 @@
+#!/bin/sh
+#
+# If a stratum has multiple chunks that have the same files in them,
+# then this should be notified
+#
+# 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
+# the Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+set -eu
+
+chunkrepo="$DATADIR/chunk-repo"
+morphsrepo="$DATADIR/morphs-repo"
+
+cd "$morphsrepo"
+git checkout --quiet -b overlap master
+cat <<EOF >hello-stratum.morph
+{
+ "name": "hello-stratum",
+ "kind": "stratum",
+ "chunks": [
+ {
+ "name": "dirs",
+ "repo": "test:chunk-repo",
+ "ref": "overlap",
+ "build-depends": [],
+ "build-mode": "test"
+ },
+ {
+ "name": "overlap-foobar",
+ "repo": "test:chunk-repo",
+ "ref": "overlap",
+ "build-depends": ["dirs"],
+ "build-mode": "test"
+ },
+ {
+ "name": "overlap-fooqux",
+ "repo": "test:chunk-repo",
+ "ref": "overlap",
+ "build-depends": ["overlap-foobar"],
+ "build-mode": "test"
+ },
+ {
+ "name": "overlap-foo-baz",
+ "repo": "test:chunk-repo",
+ "ref": "overlap",
+ "build-depends": ["overlap-fooqux"],
+ "build-mode": "test"
+ }
+ ]
+}
+EOF
+sed -i 's/master/overlap/' hello-system.morph
+git add hello-stratum.morph hello-system.morph
+git commit --quiet -m "Make hello stratum contain overlaps"
+
+cd "$chunkrepo"
+git checkout --quiet -b overlap master
+
+cat <<EOF >dirs.morph
+{
+ "name": "dirs",
+ "kind": "chunk",
+ "install-commands": [
+ "mkdir -p \$DESTDIR/bin",
+ "ln -s .. \$DESTDIR/usr"
+ ]
+}
+EOF
+git add dirs.morph
+
+cat <<EOF >overlap-foo-baz.morph
+{
+ "name": "overlap-foo-baz",
+ "kind": "chunk",
+ "install-commands": [
+ "mkdir -p \$DESTDIR/bin",
+ "for f in foo bar baz; do echo echo \$f >\$DESTDIR/bin/\$f; done"
+ ]
+}
+EOF
+git add overlap-foo-baz.morph
+
+cat <<EOF >overlap-foobar.morph
+{
+ "name": "overlap-foobar",
+ "kind": "chunk",
+ "install-commands": [
+ "mkdir -p \$DESTDIR/usr/bin \$DESTDIR/bin",
+ "echo echo foobar >\$DESTDIR/usr/bin/foobar",
+ "ln -s /usr/bin/foobar \$DESTDIR/bin/foo",
+ "ln -s /usr/bin/foobar \$DESTDIR/bin/bar"
+ ]
+}
+EOF
+git add overlap-foobar.morph
+
+cat <<EOF >overlap-fooqux.morph
+{
+ "name": "overlap-fooqux",
+ "kind": "chunk",
+ "install-commands": [
+ "mkdir -p \$DESTDIR/usr/bin \$DESTDIR/bin",
+ "for f in qux fooqux; do echo echo \$f >\$DESTDIR/usr/bin/\$f; done",
+ "ln -s /usr/bin/fooqux \$DESTDIR/bin/foo"
+ ]
+}
+EOF
+git add overlap-fooqux.morph
+
+git commit --quiet -m 'Add overlapping chunks'
diff --git a/tests.build/uses-tempdir.script b/tests.build/uses-tempdir.script
index 80c06d5..3f22e8b 100755
--- a/tests.build/uses-tempdir.script
+++ b/tests.build/uses-tempdir.script
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Copyright (C) 2011-2013 Codethink Limited
+# Copyright (C) 2011-2014 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
@@ -24,5 +24,5 @@ export TMPDIR
TMPDIR="$DATADIR"/unwritable-tmp
install -m 000 -d "$TMPDIR"
mkdir "$DATADIR"/tmp
-"$SRCDIR/scripts/test-morph" build-morphology --tempdir
"$DATADIR"/tmp \
+"$SRCDIR/scripts/test-morph" build-release --tempdir "$DATADIR"/tmp
\
test:morphs-repo master hello-system
--
1.8.5.3