Remove overlap detection logic

I've rarely needed to use it, and on those rare occasions, it would have
been easy enough to calculate it.

Let's get rid of this step, and save everyone some time in future.

5 files changed, 0 insertions, 181 deletions

diff --git a/tests.build/stratum-overlap-warns.script b/tests.build/stratum-overlap-warns.script
deleted file mode 100755
index 2a3b06e1..00000000
--- a/tests.build/stratum-overlap-warns.script
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# 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.
-
-
-## If a stratum has multiple chunks that have the same files in them,
-## then this should be noted.
-
-set -eu
-
-log="$DATADIR/morph.log"
-warnings="$DATADIR/warnings"
-cache="$DATADIR/cache/artifacts"
-
-warning_mentions(){
-    grep -F "$1" <"$warnings" >/dev/null 2>/dev/null
-}
-
-"$SRCDIR/scripts/test-morph" build-morphology --log=$log \
-    test:morphs-repo overlap hello-system > /dev/null
-grep WARNING "$log" >"$warnings"
-for str in hello-stratum \
-           overlap-foo-baz overlap-foobar bin/bar \
-           overlap-fooqux bin/foo; do
-    warning_mentions 'hello-stratum' || exit $?
-done
diff --git a/tests.build/stratum-overlap-warns.setup b/tests.build/stratum-overlap-warns.setup
deleted file mode 100755
index b969822d..00000000
--- a/tests.build/stratum-overlap-warns.setup
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# If a stratum has multiple chunks that have the same files in them,
-# then this should be notified
-#
-# 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
-# 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/stratum-overlap-writes-overlap.script b/tests.build/stratum-overlap-writes-overlap.script
deleted file mode 100755
index fe4ed4ee..00000000
--- a/tests.build/stratum-overlap-writes-overlap.script
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# 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
-# 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.
-
-
-## If a stratum has multiple chunks that have the same files in them,
-## then the overlaps must be written to the cache
-
-set -eu
-
-cache="$DATADIR/cache/artifacts"
-
-
-"$SRCDIR/scripts/test-morph" build-morphology \
-    test:morphs-repo overlap hello-system > /dev/null
-"$SRCDIR/scripts/list-overlaps" groups \
-        "$cache"/*.stratum.hello-stratum-*.overlaps |
-while IFS='\n' read overlaps; do
-    echo $overlaps
-    "$SRCDIR/scripts/list-overlaps" list-files \
-        "$cache"/*.stratum.hello-stratum-*.overlaps $overlaps
-done
diff --git a/tests.build/stratum-overlap-writes-overlap.setup b/tests.build/stratum-overlap-writes-overlap.setup
deleted file mode 120000
index 255e9a74..00000000
--- 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.stdout b/tests.build/stratum-overlap-writes-overlap.stdout
deleted file mode 100644
index 1e36ca83..00000000
--- a/tests.build/stratum-overlap-writes-overlap.stdout
+++ /dev/null
@@ -1,4 +0,0 @@
-overlap-foo-baz-bins overlap-foobar-bins overlap-fooqux-bins
-bin/foo
-overlap-foo-baz-bins overlap-foobar-bins
-bin/bar