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.

2 files changed, 0 insertions, 116 deletions

diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
deleted file mode 100755
index 9be6df13..00000000
--- a/tests.as-root/system-overlap.script
+++ /dev/null
@@ -1,113 +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 system has multiple strata that have the same files in them,
-# then this should be noted.
-
-set -eu
-
-cache="$DATADIR/cache/artifacts"
-chunkrepo="$DATADIR/chunk-repo"
-morphsrepo="$DATADIR/morphs"
-
-cd "$morphsrepo"
-git checkout --quiet -b overlap master
-cat <<EOF >overlap-system.morph
-name: overlap-system
-kind: system
-arch: $("$SRCDIR/scripts/test-morph" print-architecture)
-strata:
-  - morph: foo-baz-stratum
-  - morph: foo-barqux-stratum
-EOF
-cat <<EOF >foo-baz-stratum.morph
-name: foo-baz-stratum
-kind: stratum
-chunks:
-  - 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
-EOF
-cat <<EOF >foo-barqux-stratum.morph
-name: foo-barqux-stratum
-kind: stratum
-chunks:
-  - 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
-EOF
-git add overlap-system.morph foo-baz-stratum.morph foo-barqux-stratum.morph
-git commit --quiet -m "add overlapping system"
-
-cd "$chunkrepo"
-git checkout --quiet -b overlap master
-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
-
-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
-
-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-*.morph
-
-git commit --quiet -m 'Add overlapping chunks'
-
-"$SRCDIR/scripts/test-morph" \
-    build-morphology test:morphs overlap overlap-system > /dev/null
-"$SRCDIR/scripts/list-overlaps" groups \
-    "$cache"/*.system.overlap-system*.overlaps |
-while IFS='\n' read overlaps; do
-    echo $overlaps
-    "$SRCDIR/scripts/list-overlaps" list-files \
-        "$cache"/*.system.overlap-system*.overlaps $overlaps
-done
diff --git a/tests.as-root/system-overlap.stdout b/tests.as-root/system-overlap.stdout
deleted file mode 100644
index f67d54c8..00000000
--- a/tests.as-root/system-overlap.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-foo-barqux-stratum-runtime foo-baz-stratum-runtime
-bin/foo
-bin/bar