summaryrefslogtreecommitdiff
path: root/tests.as-root
diff options
context:
space:
mode:
Diffstat (limited to 'tests.as-root')
-rw-r--r--tests.as-root/archless-system-fails.exit1
-rwxr-xr-xtests.as-root/archless-system-fails.script35
-rw-r--r--tests.as-root/archless-system-fails.stderr1
-rwxr-xr-xtests.as-root/branch-from-image-works.script57
l---------tests.as-root/branch-from-image-works.setup1
-rw-r--r--tests.as-root/branch-from-image-works.stdout1
-rwxr-xr-xtests.as-root/build-handles-stratum-build-depends.script50
-rwxr-xr-xtests.as-root/build-with-external-strata.script62
-rwxr-xr-xtests.as-root/build-with-push.script38
-rwxr-xr-xtests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script43
-rwxr-xr-xtests.as-root/building-a-system-branch-picks-up-committed-removes.script62
-rwxr-xr-xtests.as-root/building-a-system-branch-works-anywhere.script61
-rw-r--r--tests.as-root/lib36
-rwxr-xr-xtests.as-root/metadata-includes-morph-version.script53
-rwxr-xr-xtests.as-root/metadata-includes-morph-version.setup36
-rwxr-xr-xtests.as-root/metadata-includes-repo-alias.script49
-rwxr-xr-xtests.as-root/metadata-includes-repo-alias.setup36
-rw-r--r--tests.as-root/run-in-artifact-propagates-exit-code.exit1
-rwxr-xr-xtests.as-root/run-in-artifact-propagates-exit-code.script33
-rw-r--r--tests.as-root/run-in-artifact-propagates-exit-code.stderr3
-rwxr-xr-xtests.as-root/run-in-artifact-with-different-artifacts.script47
-rw-r--r--tests.as-root/run-in-artifact-with-different-artifacts.stdout32
-rwxr-xr-xtests.as-root/setup194
-rw-r--r--tests.as-root/setup-build35
-rwxr-xr-xtests.as-root/system-overlap.script113
-rw-r--r--tests.as-root/system-overlap.stdout3
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.script44
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.setup70
-rw-r--r--tests.as-root/tarball-image-is-sensible.stderr1
-rw-r--r--tests.as-root/tarball-image-is-sensible.stdout42
30 files changed, 0 insertions, 1240 deletions
diff --git a/tests.as-root/archless-system-fails.exit b/tests.as-root/archless-system-fails.exit
deleted file mode 100644
index d00491fd..00000000
--- a/tests.as-root/archless-system-fails.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script
deleted file mode 100755
index e34e9ad6..00000000
--- a/tests.as-root/archless-system-fails.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.
-
-
-## Raise an error if system has no architecture defined.
-
-set -eu
-
-cd "$DATADIR/morphs"
-git checkout --quiet -b archless master
-cat <<EOF >archless-system.morph
-name: archless-system
-kind: system
-strata:
- - morph: hello-stratum
-EOF
-git add archless-system.morph
-git commit --quiet -m "add archless system"
-
-"$SRCDIR/scripts/test-morph" \
- build-morphology test:morphs archless archless-system
diff --git a/tests.as-root/archless-system-fails.stderr b/tests.as-root/archless-system-fails.stderr
deleted file mode 100644
index 71e7dbb0..00000000
--- a/tests.as-root/archless-system-fails.stderr
+++ /dev/null
@@ -1 +0,0 @@
-ERROR: Missing field arch from morphology string
diff --git a/tests.as-root/branch-from-image-works.script b/tests.as-root/branch-from-image-works.script
deleted file mode 100755
index fb0b09c9..00000000
--- a/tests.as-root/branch-from-image-works.script
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013-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.
-
-
-# A branch created with branch-from-image has the right commits specified
-
-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 hello-tarball)
-
-extracted="$DATADIR/extracted"
-mkdir -p "$extracted"
-tar -xf "$tar" -C "$extracted"
-get_sha1(){
- sed -nre '/sha1/s/^.*([0-9a-f]{40}).*$/\1/p' "$1"
-}
-hello_chunk_commit=$(get_sha1 "$extracted/baserock/hello-bins.meta")
-
-# Make a commit so that petrifying from HEAD is detectable
-chunkrepo="$DATADIR/chunk-repo"
-cd "$chunkrepo"
-git checkout --quiet farrokh
-sed -i -e 's/hello, world/goodbye, world/g' hello.c
-git add hello.c
-git commit --quiet -m 'Make hello say goodbye'
-
-
-workspace="$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init "$workspace"
-cd "$workspace"
-"$SRCDIR/scripts/test-morph" branch-from-image mybranch \
- --metadata-dir="$extracted/baserock"
-cd mybranch/test/morphs
-grep -qFe "$hello_chunk_commit" hello-stratum.morph
-tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact build hello-tarball)
-tar -xf "$tar" bin/hello
-bin/hello
diff --git a/tests.as-root/branch-from-image-works.setup b/tests.as-root/branch-from-image-works.setup
deleted file mode 120000
index aac6926a..00000000
--- a/tests.as-root/branch-from-image-works.setup
+++ /dev/null
@@ -1 +0,0 @@
-metadata-includes-morph-version.setup \ No newline at end of file
diff --git a/tests.as-root/branch-from-image-works.stdout b/tests.as-root/branch-from-image-works.stdout
deleted file mode 100644
index 4b5fa637..00000000
--- a/tests.as-root/branch-from-image-works.stdout
+++ /dev/null
@@ -1 +0,0 @@
-hello, world
diff --git a/tests.as-root/build-handles-stratum-build-depends.script b/tests.as-root/build-handles-stratum-build-depends.script
deleted file mode 100755
index 6e6f82da..00000000
--- a/tests.as-root/build-handles-stratum-build-depends.script
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# 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
-# 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.
-
-## "morph build" should update the build-depends fields of strata correctly.
-
-# FIXME: The new "morph edit" seems to be changing build-dependencies
-# (correctly) in a way that makes the old "morph build" fail, due to
-# this error:
-#
-# Conflicting versions of stratum 'hello-stratum' appear in the build.
-#
-# I cannot find a way to fix the old "morph build", and so I'm disabling
-# this test until it can be fixed. --liw
-exit 0
-
-set -eu
-
-. "$SRCDIR/tests.as-root/setup-build"
-
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch test:morphs test/stratum-build-depends
-
-cd test/stratum-build-depends/test/morphs
-
-# 'linux-system' and the build-depends fields of 'linux-stratum' need to
-# be updated here. Any build-depends of any altered strata also need to
-# be altered, such as the 'tools-stratum' which depends on linux-stratum
-# If they are not updated, the build command will fail.
-"$SRCDIR/scripts/test-morph" edit linux-system hello-stratum
-
-# Likewise, this command must update build-depends or the 'repo' field will
-# not be changed in the temporary build branch, leading to:
-#
-# ERROR: Ref test/stratum-build-depends is an invalid reference for
-# repo file://TMP/morphs
-#
-"$SRCDIR/scripts/test-morph" build linux-system
diff --git a/tests.as-root/build-with-external-strata.script b/tests.as-root/build-with-external-strata.script
deleted file mode 100755
index be870053..00000000
--- a/tests.as-root/build-with-external-strata.script
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-# 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
-# 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.
-
-
-## "morph build" with strata outside the branch root repository.
-
-# FIXME: The new "morph edit" breaks this, for reasons unknown. Disabling
-# it on the assumption that the new code (which changes refs to
-# build-depends) is correct and the convoluted test and the old "morph
-# build" code are wrong, but this needs to be revisited soon. --liw
-exit 0
-
-set -eu
-
-. "$SRCDIR/scripts/setup-3rd-party-strata"
-
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" branch test:morphs branch1
-
-# System will fail to build unless we add linux to it -- make the change but
-# don't commit it, in one of the external strata, as a challenge for
-# 'morph build'.
-cd "branch1"
-cd "test/external-strata"
-
-awk '
- /^chunks:/ {
- print $0
- print "- name: linux"
- print " repo: test:kernel-repo"
- print " ref: master"
- print " build-mode: test"
- print " build-depends: []"
- next
- }
- { print }
-' stratum2.morph > temp
-mv temp stratum2.morph
-
-# Ignore Morph's output for now because it gives us:
-# 2012-11-07 16:26:12 Overlaps in system artifact hello-system-rootfs detected
-#
-# This is due to having a chunk named 'hello' in more than one stratum. It's
-# a bug that this generates overlaps (the chunk's .meta file needs to be called
-# $stratum.$chunk.meta rather than $chunk.meta to avoid the overlap) and the
-# redirection should be removed once this bug is fixed.
-"$SRCDIR/scripts/test-morph" build hello-system > /dev/null
-
-[ $("$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" | wc -l) -eq 23 ]
diff --git a/tests.as-root/build-with-push.script b/tests.as-root/build-with-push.script
deleted file mode 100755
index ead669ed..00000000
--- a/tests.as-root/build-with-push.script
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# 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.
-
-# Test 'morph build' when build without push is disabled, i.e. everything is
-# built from the remote repositories instead of the local checkouts.
-
-# FIXME: This seems to break because the new "morph edit" makes correct
-# changes to build-dependencies, which breaks the old "morph build".
-# Disable test now, re-enable it after "morph build" is fixed. --liw
-exit 0
-
-
-set -eu
-
-source "$SRCDIR/tests.as-root/setup-build"
-
-cd "$DATADIR/workspace/branch1"
-"$SRCDIR/scripts/test-morph" --push-build-branches build linux-system
-
-# Test that the chunk was built from test:kernel-repo and not a local branch
-cd "$DATADIR/cache/artifacts"
-tar xf *.chunk.linux baserock/linux.meta
-grep -q "\"repo\": \"file://$DATADIR/kernel-repo\"" baserock/linux.meta
-
-
diff --git a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script b/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script
deleted file mode 100755
index ac6cffec..00000000
--- a/tests.as-root/building-a-system-branch-multiple-times-doesnt-generate-new-artifacts.script
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-#
-# 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
-# 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.
-
-## Make sure "morph build" works anywhere in a workspace or system branch
-## and produces the same results every time.
-
-# FIXME: This seems to break because the new "morph edit" makes correct
-# changes to build-dependencies, which breaks the old "morph build".
-# Disable test now, re-enable it after "morph build" is fixed. --liw
-exit 0
-
-set -eu
-
-source "$SRCDIR/tests.as-root/setup-build"
-
-# Build once.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" build linux-system
-ARTIFACT_COUNT="$(ls "$DATADIR/cache/artifacts" | wc -l)"
-
-# Build twice.
-cd "$DATADIR/workspace/branch1"
-"$SRCDIR/scripts/test-morph" build linux-system
-[ "$ARTIFACT_COUNT" -eq $(ls "$DATADIR/cache/artifacts" | wc -l) ]
-
-# Build thrice, and that should be enough.
-cd "$DATADIR/workspace/branch1/test/morphs"
-"$SRCDIR/scripts/test-morph" build linux-system
-[ "$ARTIFACT_COUNT" -eq $(ls "$DATADIR/cache/artifacts" | wc -l) ]
diff --git a/tests.as-root/building-a-system-branch-picks-up-committed-removes.script b/tests.as-root/building-a-system-branch-picks-up-committed-removes.script
deleted file mode 100755
index 64ae82c7..00000000
--- a/tests.as-root/building-a-system-branch-picks-up-committed-removes.script
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2013-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.
-
-# FIXME: This seems to break because the new "morph edit" makes correct
-# changes to build-dependencies, which breaks the old "morph build".
-# Disable test now, re-enable it after "morph build" is fixed. --liw
-exit 0
-
-set -e
-
-. "$SRCDIR/tests.as-root/setup-build"
-KERNEL_BRANCH=baserock/builds/123456789/AABBCCDDE
-
-cd "$DATADIR/workspace/branch1/test/kernel-repo"
-git checkout --quiet master
-echo Use Morph >README
-git add README
-git commit --quiet -m 'Add README'
-
-# Build the linux system from the system branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" build linux-system
-
-# Make a change elsewhere to be pulled in
-PEER_REPO="$DATADIR/peer-kernel"
-git clone --quiet "file://$DATADIR/workspace/branch1/test/kernel-repo" \
- "$PEER_REPO"
-cd "$PEER_REPO"
-git checkout --quiet -b fix
-# remove useless README
-git rm --quiet README
-git commit --quiet -m 'change stuff'
-git checkout --quiet master
-git merge --no-ff fix >/dev/null 2>&1
-
-# Pull a commit in to the linux morphology.
-cd "$DATADIR/workspace/branch1/test/kernel-repo"
-git remote add peer "file://$PEER_REPO"
-git remote update >/dev/null 2>&1
-git merge --quiet peer/master
-
-# Build the linux system again without comitting.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" build linux-system
-cd branch1/test/kernel-repo
-
-# Check whether the new morphology exists in the temporary build ref
-cd "$DATADIR/workspace/branch1/test/kernel-repo"
-! git cat-file blob "$KERNEL_BRANCH:README" >/dev/null 2>&1
diff --git a/tests.as-root/building-a-system-branch-works-anywhere.script b/tests.as-root/building-a-system-branch-works-anywhere.script
deleted file mode 100755
index cf946cd5..00000000
--- a/tests.as-root/building-a-system-branch-works-anywhere.script
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# 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
-# 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.
-
-
-## Make sure "morph build" works anywhere in a workspace or system branch
-## and produces the same results every time.
-
-# FIXME: This seems to break because the new "morph edit" makes correct
-# changes to build-dependencies, which breaks the old "morph build".
-# Disable test now, re-enable it after "morph build" is fixed. --liw
-exit 0
-
-set -eu
-
-source "$SRCDIR/tests.as-root/setup-build"
-
-# Build from the workspace root.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" build linux-system
-"$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output1"
-rm -rf "$DATADIR/cache"/*
-
-# Build from the branch.
-cd "$DATADIR/workspace/branch1"
-"$SRCDIR/scripts/test-morph" build linux-system
-"$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output2"
-rm -rf "$DATADIR/cache/artifacts"/*
-
-# Build form the branch root repository.
-cd "$DATADIR/workspace/branch1/test/morphs"
-"$SRCDIR/scripts/test-morph" build linux-system
-"$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output3"
-rm -rf "$DATADIR/cache/artifacts"/*
-
-# Build from the linux directory.
-cd "$DATADIR/workspace/branch1/test/kernel-repo"
-"$SRCDIR/scripts/test-morph" build linux-system
-"$SRCDIR/scripts/list-tree" "$DATADIR/cache/artifacts" > "$DATADIR/output4"
-rm -rf "$DATADIR/cache/artifacts"/*
-
-# Verify that we build the right number of artifacts
-[ $(wc < "$DATADIR/output1" -l) -eq 22 ]
-
-# List of files in the artifact cache should be identical after each build
-diff "$DATADIR/output1" "$DATADIR/output2"
-diff "$DATADIR/output2" "$DATADIR/output3"
-diff "$DATADIR/output3" "$DATADIR/output4"
diff --git a/tests.as-root/lib b/tests.as-root/lib
deleted file mode 100644
index d17d8e32..00000000
--- a/tests.as-root/lib
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2012 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.
-
-
-## Helper functions for as-root tests
-
-loopback_rootfs() {
- # Find offset partition offset in a rootfs and mount it
- ROOTFS="$1"
-
- PYTHONPATH="$SRCDIR" "$SRCDIR/scripts/sparse-gunzip" \
- <"$ROOTFS" >"$ROOTFS-unzipped"
-
- OFFSET=$(sfdisk -d "$ROOTFS-unzipped" | \
- grep -m 1 -o 'start=\s\+\([0-9]\+\)' | awk '{ print $2 }')
- OFFSET=$(expr "$OFFSET" '*' 512)
-
- DEVICE=$(losetup --show -o "$OFFSET" -f "$ROOTFS-unzipped")
- udevadm settle
-
- echo "$DEVICE"
-}
diff --git a/tests.as-root/metadata-includes-morph-version.script b/tests.as-root/metadata-includes-morph-version.script
deleted file mode 100755
index 772d7d50..00000000
--- a/tests.as-root/metadata-includes-morph-version.script
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013 - 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.
-
-
-# All the metadata files in /baserock of a system contain morph's version
-# information
-
-set -eu
-
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
-. "$SRCDIR/scripts/fix-committer-info"
-
-# get git version info
-cd "$SRCDIR"
-description="$(git describe --abbrev=40 --always \
- --dirty=-unreproducible --match=DO-NOT-MATCH-ANY-TAGS)"
-commit="$(git rev-parse 'HEAD^{commit}')"
-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)
-
-extracted="$DATADIR/extracted"
-mkdir -p "$extracted"
-tar -xf "$tar" -C "$extracted"
-cd "$extracted/baserock"
-for f in *.meta; do
- # Check for git describe output
- grep -q -F -e "$description" "$f"
- # Check the Sha-1 commit is included
- grep -q -F -e "$commit" "$f"
- # Check the Sha-1 of the commit's tree is included
- grep -q -F -e "$tree" "$f"
- # Check the ref (e.g. branch) is included
- grep -q -F -e "$ref" "$f"
-done
diff --git a/tests.as-root/metadata-includes-morph-version.setup b/tests.as-root/metadata-includes-morph-version.setup
deleted file mode 100755
index e4557302..00000000
--- a/tests.as-root/metadata-includes-morph-version.setup
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013-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"
-
-morphsrepo="$DATADIR/morphs"
-cd "$morphsrepo"
-git checkout -b tarball
-cat <<EOF > hello-tarball.morph
-name: hello-tarball
-kind: system
-arch: $("$SRCDIR/scripts/test-morph" print-architecture)
-strata:
- - morph: hello-stratum
- - morph: linux-stratum
-EOF
-git add hello-tarball.morph
-
-git commit --quiet -m "add tarball system"
diff --git a/tests.as-root/metadata-includes-repo-alias.script b/tests.as-root/metadata-includes-repo-alias.script
deleted file mode 100755
index 9e4a5d98..00000000
--- a/tests.as-root/metadata-includes-repo-alias.script
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2013-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.
-
-
-# All the metadata files in /baserock of a system contain the repository
-# alias they were built from.
-
-set -eu
-
-# Disable test on versions of Python before 2.7.
-. "$SRCDIR/scripts/python-check"
-
-. "$SRCDIR/scripts/fix-committer-info"
-
-# get git version info
-cd "$SRCDIR"
-
-tar=$("$SRCDIR/scripts/test-morph" --find-system-artifact \
- build-morphology test:morphs tarball hello-tarball)
-
-extracted="$DATADIR/extracted"
-mkdir -p "$extracted"
-tar -xf "$tar" -C "$extracted"
-cd "$extracted/baserock"
-
-# Check for test:morphs in System and Stratum
-#grep -q -F -e test:morphs hello-tarball.meta # tarball bug
-grep -q -F -e test:morphs hello-stratum-runtime.meta
-grep -q -F -e test:morphs linux-stratum-runtime.meta
-
-# Check for test:kernel-repo in linux
-grep -q -F -e test:kernel-repo linux-misc.meta
-
-# Check for test:chunk-repo in hello
-grep -q -F -e test:chunk-repo hello-bins.meta
diff --git a/tests.as-root/metadata-includes-repo-alias.setup b/tests.as-root/metadata-includes-repo-alias.setup
deleted file mode 100755
index e4557302..00000000
--- a/tests.as-root/metadata-includes-repo-alias.setup
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013-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"
-
-morphsrepo="$DATADIR/morphs"
-cd "$morphsrepo"
-git checkout -b tarball
-cat <<EOF > hello-tarball.morph
-name: hello-tarball
-kind: system
-arch: $("$SRCDIR/scripts/test-morph" print-architecture)
-strata:
- - morph: hello-stratum
- - morph: linux-stratum
-EOF
-git add hello-tarball.morph
-
-git commit --quiet -m "add tarball system"
diff --git a/tests.as-root/run-in-artifact-propagates-exit-code.exit b/tests.as-root/run-in-artifact-propagates-exit-code.exit
deleted file mode 100644
index d00491fd..00000000
--- a/tests.as-root/run-in-artifact-propagates-exit-code.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/tests.as-root/run-in-artifact-propagates-exit-code.script b/tests.as-root/run-in-artifact-propagates-exit-code.script
deleted file mode 100755
index d815c73d..00000000
--- a/tests.as-root/run-in-artifact-propagates-exit-code.script
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-#
-# 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.
-
-
-## Test that 'run-in-artifact' propagates the exit code of its command.
-
-set -eu
-
-. "$SRCDIR/tests.as-root/lib"
-
-# Build first image. Remember the stratum.
-"$SRCDIR/scripts/test-morph" build-morphology \
- test:morphs master linux-system
-
-system=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs')
-
-# Run 'run-in-artifact' with the system artifact. The command will fail
-# and this should result in an exit code of 1 in the test.
-"$SRCDIR/scripts/test-morph" run-in-artifact "$system" -- ls i-do-not-exist
diff --git a/tests.as-root/run-in-artifact-propagates-exit-code.stderr b/tests.as-root/run-in-artifact-propagates-exit-code.stderr
deleted file mode 100644
index 98aa5450..00000000
--- a/tests.as-root/run-in-artifact-propagates-exit-code.stderr
+++ /dev/null
@@ -1,3 +0,0 @@
-ERROR: Command failed: ls i-do-not-exist
-ls: i-do-not-exist: No such file or directory
-
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.script b/tests.as-root/run-in-artifact-with-different-artifacts.script
deleted file mode 100755
index 57d408e3..00000000
--- a/tests.as-root/run-in-artifact-with-different-artifacts.script
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-#
-# 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
-# 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.
-
-
-## Test the 'run-in-artifact' command with different types of artifacts.
-
-set -eu
-
-. "$SRCDIR/tests.as-root/lib"
-
-# Build first image. Remember the stratum.
-"$SRCDIR/scripts/test-morph" build-morphology \
- test:morphs master linux-system
-
-system=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.system.*-rootfs')
-chunk=$(find "$DATADIR/cache/artifacts" -maxdepth 1 -name '*.chunk.linux-misc')
-stratum=$(find "$DATADIR/cache/artifacts" -maxdepth 1 \
- -name '*.stratum.linux-stratum-runtime')
-
-# Run 'run-in-artifact' with the system artifact.
-echo "System:"
-"$SRCDIR/scripts/test-morph" run-in-artifact "$system" -- ls baserock/
-echo
-
-# Run 'run-in-artifact' with the chunk artifact.
-echo "Chunk:"
-"$SRCDIR/scripts/test-morph" run-in-artifact "$chunk" -- ls baserock/
-echo
-
-# Run 'run-in-artifact' with the statum artifact.
-echo "Stratum:"
-"$SRCDIR/scripts/test-morph" run-in-artifact "$stratum" -- ls baserock/ \
- 2>/dev/null || echo "Failed"
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.stdout b/tests.as-root/run-in-artifact-with-different-artifacts.stdout
deleted file mode 100644
index 7473990b..00000000
--- a/tests.as-root/run-in-artifact-with-different-artifacts.stdout
+++ /dev/null
@@ -1,32 +0,0 @@
-System:
-hello-bins.meta
-hello-devel.meta
-hello-doc.meta
-hello-libs.meta
-hello-locale.meta
-hello-misc.meta
-hello-stratum-devel.meta
-hello-stratum-runtime.meta
-linux-bins.meta
-linux-devel.meta
-linux-doc.meta
-linux-libs.meta
-linux-locale.meta
-linux-misc.meta
-linux-stratum-devel.meta
-linux-stratum-runtime.meta
-linux-system-rootfs.meta
-tools-bins.meta
-tools-devel.meta
-tools-doc.meta
-tools-libs.meta
-tools-locale.meta
-tools-misc.meta
-tools-stratum-devel.meta
-tools-stratum-runtime.meta
-
-Chunk:
-linux-misc.meta
-
-Stratum:
-Failed
diff --git a/tests.as-root/setup b/tests.as-root/setup
deleted file mode 100755
index 1cf9dd04..00000000
--- a/tests.as-root/setup
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/bash
-#
-# Create git repositories for tests. The chunk repository will contain a
-# simple "hello, world" C program, and two branches ("master", "farrokh"),
-# with the master branch containing just a README. The two branches are there
-# so that we can test building a branch that hasn't been checked out.
-# The branches are different so that we know that if the wrong branch
-# is uses, the build will fail.
-#
-# The stratum repository contains a single branch, "master", with a
-# stratum and a system morphology that include the chunk above.
-#
-# Copyright (C) 2011, 2012, 2013, 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"
-
-# The $DATADIR should be empty at the beginnig of each test.
-find "$DATADIR" -mindepth 1 -delete
-
-# Create an empty directory to be used as a morph workspace
-mkdir "$DATADIR/workspace"
-
-# Create chunk repository.
-
-chunkrepo="$DATADIR/chunk-repo"
-mkdir "$chunkrepo"
-cd "$chunkrepo"
-git init --quiet
-
-cat <<EOF > README
-This is a sample README.
-EOF
-git add README
-git commit --quiet -m "add README"
-
-git checkout --quiet -b farrokh
-
-cat <<EOF > hello.c
-#include <stdio.h>
-int main(void)
-{
- puts("hello, world");
- return 0;
-}
-EOF
-git add hello.c
-
-cat <<EOF > hello.morph
-name: hello
-kind: chunk
-build-system: dummy
-build-commands:
- - gcc -o hello hello.c
-install-commands:
- - install -d "\$DESTDIR"/etc
- - install -d "\$DESTDIR"/bin
- - install hello "\$DESTDIR"/bin/hello
-EOF
-git add hello.morph
-
-git commit --quiet -m "add a hello world program and morph"
-
-git checkout --quiet master
-
-
-# Create tools repository, so there is an extra layer of build-depends
-toolsrepo="$DATADIR/tools-repo"
-mkdir -p "$toolsrepo"
-cd "$toolsrepo"
-git init --quiet
-cat <<'EOF' >tools.morph
-name: tools
-kind: chunk
-build-commands:
- - echo 'echo dummy strace' >strace
-install-commands:
- - mkdir -p "$DESTDIR/bin"
- - install strace "$DESTDIR/bin/strace"
-EOF
-git add tools.morph
-git commit --quiet -m "add morphology"
-
-# Create morph repository.
-
-morphsrepo="$DATADIR/morphs"
-mkdir "$morphsrepo"
-cd "$morphsrepo"
-git init --quiet
-
-cat <<EOF > hello-stratum.morph
-name: hello-stratum
-kind: stratum
-chunks:
- - name: hello
- repo: test:chunk-repo
- ref: farrokh
- build-mode: test
- build-depends: []
-EOF
-git add hello-stratum.morph
-
-cat <<EOF > tools-stratum.morph
-name: tools-stratum
-kind: stratum
-build-depends:
- - morph: linux-stratum
-chunks:
- - name: tools
- repo: test:tools-repo
- ref: master
- build-mode: test
- build-depends: []
-EOF
-git add tools-stratum.morph
-
-cat <<EOF > hello-system.morph
-name: hello-system
-kind: system
-arch: `"$SRCDIR/scripts/test-morph" print-architecture`
-strata:
- - morph: hello-stratum
-EOF
-git add hello-system.morph
-
-cat <<EOF > linux-stratum.morph
-name: linux-stratum
-kind: stratum
-build-depends:
- - morph: hello-stratum
-chunks:
- - name: linux
- repo: test:kernel-repo
- ref: master
- build-mode: test
- build-depends: []
-EOF
-git add linux-stratum.morph
-
-cat <<EOF > linux-system.morph
-name: linux-system
-kind: system
-arch: `"$SRCDIR/scripts/test-morph" print-architecture`
-strata:
- - morph: hello-stratum
- - morph: linux-stratum
- - morph: tools-stratum
-EOF
-git add linux-system.morph
-
-git commit --quiet -m "add morphs"
-
-# Make a dummy kernel chunk.
-mkdir "$DATADIR/kernel-repo"
-cat <<EOF > "$DATADIR/kernel-repo/linux.morph"
-name: linux
-kind: chunk
-install-commands:
- - mkdir -p "\$DESTDIR/boot"
- - touch "\$DESTDIR/extlinux.conf"
- - touch "\$DESTDIR/boot/vmlinuz"
- - touch "\$DESTDIR/boot/System.map"
-EOF
-"$SRCDIR/scripts/run-git-in" "$DATADIR/kernel-repo" init --quiet
-"$SRCDIR/scripts/run-git-in" "$DATADIR/kernel-repo" add .
-"$SRCDIR/scripts/run-git-in" "$DATADIR/kernel-repo" commit --quiet -m foo \
- > /dev/null
-
-# Create a morph configuration file.
-cat <<EOF > "$DATADIR/morph.conf"
-[config]
-repo-alias = test=file://$DATADIR/#file://$DATADIR/
-cachedir = $DATADIR/cache
-log = $DATADIR/morph.log
-no-distcc = true
-quiet = true
-log = /tmp/morph.log
-EOF
-
diff --git a/tests.as-root/setup-build b/tests.as-root/setup-build
deleted file mode 100644
index 1f6f1c39..00000000
--- a/tests.as-root/setup-build
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2012 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.
-
-
-## Fixture for tests involving 'morph build'
-
-source "$SRCDIR/scripts/fix-committer-info"
-
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" branch test:morphs branch1
-"$SRCDIR/scripts/test-morph" edit linux-system linux-stratum linux
-
-# Fix UUID's in the checked out repos to make build branch names deterministic
-git config -f "$DATADIR/workspace/branch1/.morph-system-branch/config" \
- branch.uuid 123456789
-git config -f "$DATADIR/workspace/branch1/test:morphs/.git/config" \
- morph.uuid 987654321
-git config -f "$DATADIR/workspace/branch1/test:kernel-repo/.git/config" \
- morph.uuid AABBCCDDE
-
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
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"