Remove unused cmdtests

tests.deploy is gone since we have yarn coverage instead.

tests/setup had unnecessary setup in it, since the remaining tests
require custom setup anyway.

A bunch of tests were disabled anyway, so they're gone.

Also, there was still code in ./check to run tests.merging, which have
been gone for a while.

6 files changed, 0 insertions, 316 deletions

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"