Remove tarball image format tests from tests.as-root

We're implicitly testing it in yarns already.

Explicit tests would be better, but removing the old test makes it
easier to get rid of build-mode: test.

4 files changed, 0 insertions, 157 deletions

diff --git a/tests.as-root/tarball-image-is-sensible.script b/tests.as-root/tarball-image-is-sensible.script
deleted file mode 100755
index 0fb6d9b2..00000000
--- a/tests.as-root/tarball-image-is-sensible.script
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012-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.
-
-
-# A system kind of 'rootfs-tarball' should create a tarball containing
-# all the required files.
-
-set -eu
-
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
-. "$SRCDIR/scripts/fix-committer-info"
-
-tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
-    build-morphology test:morphs tarball-links hello-tarball)
-
-# Verify that the tar archive is not compressed.
-if gunzip -t "$tar" > /dev/null
-then
-    echo "ERROR: $tar is gzip'd!" 1>&2
-    exit 1
-fi
-
-extracted="$DATADIR/extracted"
-mkdir -p "$extracted"
-cd "$extracted"
-tar -xf "$tar"
-find . -mindepth 1 | xargs ls -dF | LC_ALL=C sort -u
-cat "$extracted/etc/os-release"
diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup
deleted file mode 100755
index a687b691..00000000
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-#
-# 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
-
-source "$SRCDIR/scripts/fix-committer-info"
-
-chunkrepo="$DATADIR/chunk-repo"
-cd "$chunkrepo"
-git checkout -b tarball-links
-cat >links.morph <<'EOF'
-name: links
-kind: chunk
-build-system: manual
-install-commands:
-  - mkdir -p "$DESTDIR/bin"
-  - touch "$DESTDIR/bin/true"
-  - cd "$DESTDIR/bin" && ln true true-hardlink
-  - cd "$DESTDIR/bin" && ln -s true true-symlink
-EOF
-git add links.morph
-git commit --quiet -m 'Add link adding chunk'
-
-morphsrepo="$DATADIR/morphs"
-cd "$morphsrepo"
-git checkout -b tarball-links
-cat <<EOF > hello-tarball.morph
-name: hello-tarball
-kind: system
-arch: $("$SRCDIR/scripts/test-morph" print-architecture)
-strata:
-  - morph: link-stratum
-  - morph: hello-stratum
-  - morph: linux-stratum
-EOF
-git add hello-tarball.morph
-
-# Change build-depends ref of hello-stratum from master to tarball-links
-sed -i linux-stratum.morph \
-    -e '/build-depends:/,/chunks/ s/ref: master/ref: tarball-links/'
-
-git add linux-stratum.morph
-
-cat <<EOF > link-stratum.morph
-name: link-stratum
-kind: stratum
-chunks:
-  - name: links
-    repo: test:chunk-repo
-    ref: tarball-links
-    build-mode: test
-    build-depends: []
-EOF
-git add link-stratum.morph
-git commit --quiet -m "add morphs"
diff --git a/tests.as-root/tarball-image-is-sensible.stderr b/tests.as-root/tarball-image-is-sensible.stderr
deleted file mode 100644
index 9db65e02..00000000
--- a/tests.as-root/tarball-image-is-sensible.stderr
+++ /dev/null
@@ -1 +0,0 @@
-gunzip: invalid magic
diff --git a/tests.as-root/tarball-image-is-sensible.stdout b/tests.as-root/tarball-image-is-sensible.stdout
deleted file mode 100644
index cf74a1ec..00000000
--- a/tests.as-root/tarball-image-is-sensible.stdout
+++ /dev/null
@@ -1,42 +0,0 @@
-./baserock/
-./baserock/hello-bins.meta
-./baserock/hello-devel.meta
-./baserock/hello-doc.meta
-./baserock/hello-libs.meta
-./baserock/hello-locale.meta
-./baserock/hello-misc.meta
-./baserock/hello-stratum-devel.meta
-./baserock/hello-stratum-runtime.meta
-./baserock/hello-tarball-rootfs.meta
-./baserock/link-stratum-devel.meta
-./baserock/link-stratum-runtime.meta
-./baserock/links-bins.meta
-./baserock/links-devel.meta
-./baserock/links-doc.meta
-./baserock/links-libs.meta
-./baserock/links-locale.meta
-./baserock/links-misc.meta
-./baserock/linux-bins.meta
-./baserock/linux-devel.meta
-./baserock/linux-doc.meta
-./baserock/linux-libs.meta
-./baserock/linux-locale.meta
-./baserock/linux-misc.meta
-./baserock/linux-stratum-devel.meta
-./baserock/linux-stratum-runtime.meta
-./bin/
-./bin/hello*
-./bin/true
-./bin/true-hardlink
-./bin/true-symlink@
-./boot/
-./boot/System.map
-./boot/vmlinuz
-./etc/
-./etc/os-release
-./extlinux.conf
-NAME="Baserock"
-ID=baserock
-HOME_URL="http://wiki.baserock.org"
-SUPPORT_URL="http://wiki.baserock.org/mailinglist"
-BUG_REPORT_URL="http://wiki.baserock.org/mailinglist"