Merge remote-tracking branch 'origin/baserock/richardmaw/S10630-32-bit-tests'

21 files changed, 97 insertions, 266 deletions

diff --git a/check b/check
index 3aa83fe4..a5ef4128 100755
--- a/check
+++ b/check
@@ -23,13 +23,61 @@ set -e
 
 # Parse the command line.
 
-full=false
+run_style=false
+run_unit_tests=false
+run_cmdtests=false
+run_slow_cmdtests=false
+run_yarns=false
+if [ "$#" -eq 0 ]; then
+    run_style=true
+    run_unit_tests=true
+    run_cmdtests=true
+    run_slow_cmdtests=false
+    run_yarns=true
+fi
 while [ "$#" -gt 0 ]
 do
     case "$1" in
-        --full) full=true; shift ;;
-        *) echo "ERROR: Unknown argument $1." 1>&2; exit 1 ;;
+    --full)
+        run_style=true
+        run_unit_tests=true
+        run_cmdtests=true
+        run_slow_cmdtests=true
+        run_yarns=true
+        ;;
+    --style)
+        run_style=true
+        ;;
+    --no-style)
+        run_style=false
+        ;;
+    --unit-tests)
+        run_unit_tests=true
+        ;;
+    --no-unit-tests)
+        run_unit_tests=false
+        ;;
+    --cmdtests)
+        run_cmdtests=true
+        ;;
+    --no-cmdtests)
+        run_cmdtests=false
+        ;;
+    --slow-cmdtests)
+        run_slow_cmdtests=true
+        ;;
+    --no-slow-cmdtests)
+        run_slow_cmdtests=false
+        ;;
+    --yarns)
+        run_yarns=true
+        ;;
+    --no-yarns)
+        run_yarns=false
+        ;;
+    *) echo "ERROR: Unknown argument $1." 1>&2; exit 1 ;;
     esac
+    shift
 done
 
 
@@ -45,7 +93,7 @@ export PYTHONPATH
 # Run the style checks
 
 errors=0
-if [ -d .git ];
+if "$run_style" && [ -d .git ];
 then
     echo "Checking copyright statements"
     if ! (git ls-files -z | xargs -0r scripts/check-copyright-year); then
@@ -68,7 +116,9 @@ fi
 # Clean up artifacts from previous (possibly failed) runs, build,
 # and run the tests.
 
-python setup.py clean check
+if "$run_unit_tests"; then
+    python setup.py clean check
+fi
 
 # Run scenario tests with yarn, if yarn is available.
 #
@@ -83,7 +133,7 @@ python setup.py clean check
 # explicitly which environment variables to set in addition to the set
 # it sets anyway.
 
-if command -v yarn > /dev/null
+if "$run_yarns" && command -v yarn > /dev/null
 then
     yarn --env "PYTHONPATH=$PYTHONPATH" -s yarns/morph.shell-lib yarns/*.yarn
 fi
@@ -92,41 +142,56 @@ fi
 
 HOME="$(pwd)/scripts"
 
-cmdtest tests
+if "$run_cmdtests"
+then
+    cmdtest tests
+else
+    echo "NOT RUNNING test"
+fi
 
-if $full
+if "$run_slow_cmdtests"
 then
     cmdtest tests.branching
 else
     echo "NOT RUNNING test.branching"
 fi
 
-if $full && false
+if false && "$run_cmdtests"
 then
     cmdtest tests.merging
 else
     echo "NOT RUNNING test.merging"
 fi
 
-cmdtest tests.deploy
+if "$run_cmdtests"
+then
+    cmdtest tests.deploy
+else
+    echo "NOT RUNNING test.deploy"
+fi
 
 # Building systems requires the 'filter' parameter of tarfile.TarFile.add():
 # this was introduced in Python 2.7
-if python --version 2>&1 | grep '^Python 2\.[78]' > /dev/null; then
-    cmdtest tests.build
-else
+if ! "$run_cmdtests"; then
+    echo "NOT RUNNING tests.build"
+elif ! (python --version 2>&1 | grep -q '^Python 2\.[78]'); then
     echo "NOT RUNNING tests.build (requires Python 2.7)"
+else
+    cmdtest tests.build
 fi
 
 # The as-root tests use YAML morphologies, so they require the PyYAML module.
-if $full && [ $(whoami) = root ] && command -v mkfs.btrfs > /dev/null &&
-    python -c "
+if ! "$run_slow_cmdtests"; then
+    echo "NOT RUNNING tests.as-root"
+elif [ $(whoami) != root ] || ! command -v mkfs.btrfs > /dev/null; then
+    echo "NOT RUNNING tests.as-root (no btrfs)"
+elif ! python -c "
 import morphlib, sys
 if not morphlib.got_yaml:
     sys.exit(1)
 " > /dev/null 2>&1
 then
-    cmdtest tests.as-root
-else
     echo "NOT RUNNING tests.as-root (requires PyYAML)"
+else
+    cmdtest tests.as-root
 fi
diff --git a/tests.as-root/metadata-includes-morph-version.setup b/tests.as-root/metadata-includes-morph-version.setup
index 31829b01..d7fc96e3 100755
--- a/tests.as-root/metadata-includes-morph-version.setup
+++ b/tests.as-root/metadata-includes-morph-version.setup
@@ -27,7 +27,7 @@ cat <<EOF > hello-tarball.morph
 {
     "name": "hello-tarball",
     "kind": "system",
-    "arch": "$(uname -m)",
+    "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests.as-root/metadata-includes-repo-alias.setup b/tests.as-root/metadata-includes-repo-alias.setup
index 31829b01..d7fc96e3 100755
--- a/tests.as-root/metadata-includes-repo-alias.setup
+++ b/tests.as-root/metadata-includes-repo-alias.setup
@@ -27,7 +27,7 @@ cat <<EOF > hello-tarball.morph
 {
     "name": "hello-tarball",
     "kind": "system",
-    "arch": "$(uname -m)",
+    "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index 20b61507..e0829968 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -23,7 +23,7 @@ set -eu
 
 cache="$DATADIR/cache/artifacts"
 
-arch=$(uname -m)
+arch=$("$SRCDIR/scripts/test-morph" print-architecture)
 
 cd "$DATADIR/kernel-repo"
 cat <<EOF >linux.morph
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.script b/tests.as-root/run-in-artifact-with-different-artifacts.script
index ff944af4..57d408e3 100755
--- a/tests.as-root/run-in-artifact-with-different-artifacts.script
+++ b/tests.as-root/run-in-artifact-with-different-artifacts.script
@@ -44,4 +44,4 @@ echo
 # Run 'run-in-artifact' with the statum artifact.
 echo "Stratum:"
 "$SRCDIR/scripts/test-morph" run-in-artifact "$stratum" -- ls baserock/ \
-    || echo "Failed"
+    2>/dev/null || echo "Failed"
diff --git a/tests.as-root/run-in-artifact-with-different-artifacts.stderr b/tests.as-root/run-in-artifact-with-different-artifacts.stderr
deleted file mode 100644
index 9241fbb5..00000000
--- a/tests.as-root/run-in-artifact-with-different-artifacts.stderr
+++ /dev/null
@@ -1 +0,0 @@
-ERROR: Artifact TMP/cache/artifacts/e8e771e742c8f2199bd9f1e29cbeca07dbd51dd8880136d6521093711d37d8bf.stratum.linux-stratum-runtime cannot be extracted or mounted
diff --git a/tests.as-root/setup b/tests.as-root/setup
index b865f42d..1cf9dd04 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -132,7 +132,7 @@ git add tools-stratum.morph
 cat <<EOF > hello-system.morph
 name: hello-system
 kind: system
-arch: `uname -m`
+arch: `"$SRCDIR/scripts/test-morph" print-architecture`
 strata:
     - morph: hello-stratum
 EOF
@@ -155,7 +155,7 @@ git add linux-stratum.morph
 cat <<EOF > linux-system.morph
 name: linux-system
 kind: system
-arch: `uname -m`
+arch: `"$SRCDIR/scripts/test-morph" print-architecture`
 strata:
     - morph: hello-stratum
     - morph: linux-stratum
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index c6154e0e..1ce8379d 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -31,7 +31,7 @@ cat <<EOF >overlap-system.morph
 {
   "name": "overlap-system",
   "kind": "system",
-  "arch": "$(uname -m)",
+  "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
   "strata": [
     {
       "morph": "foo-baz-stratum",
diff --git a/tests.as-root/tarball-image-is-sensible.setup b/tests.as-root/tarball-image-is-sensible.setup
index 505707b3..c47a5336 100755
--- a/tests.as-root/tarball-image-is-sensible.setup
+++ b/tests.as-root/tarball-image-is-sensible.setup
@@ -46,7 +46,7 @@ cat <<EOF > hello-tarball.morph
 {
     "name": "hello-tarball",
     "kind": "system",
-    "arch": "$(uname -m)",
+    "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
     "strata": [
         {
             "morph": "link-stratum",
diff --git a/tests.branching/setup b/tests.branching/setup
index 06a05e90..22c51c24 100755
--- a/tests.branching/setup
+++ b/tests.branching/setup
@@ -50,7 +50,7 @@ ln -s "$DATADIR/morphs" "$DATADIR/morphs.git"
 cat <<EOF > "$DATADIR/morphs/hello-system.morph"
 name: hello-system
 kind: system
-arch: $(uname -m)
+arch: $("$SRCDIR/scripts/test-morph" print-architecture)
 strata:
 - morph: hello-stratum
 EOF
diff --git a/tests.branching/tag-creates-commit-and-tag.script b/tests.branching/tag-creates-commit-and-tag.script
deleted file mode 100755
index 8fd45d16..00000000
--- a/tests.branching/tag-creates-commit-and-tag.script
+++ /dev/null
@@ -1,39 +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.
-
-
-## Check that 'morph tag example-tag' successfully creates a dangling
-## commit and an annotated tag pointing to this commit.
-
-set -eu
-
-# Make sure the commits always have the same SHA1s.
-. "$SRCDIR/scripts/fix-committer-info"
-
-# Create a workspace and branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout test:morphs master
-
-# Tag the system branch.
-"$SRCDIR/scripts/test-morph" tag example-tag -- -m Message
-
-# Show the tag itself and its log. This allows to verify a couple of things,
-# including that the commit and tag are created, that the commit message is
-# set correctly and that all references are petrified.
-"$SRCDIR/scripts/test-morph" foreach -- git show example-tag
-"$SRCDIR/scripts/test-morph" foreach -- git log --format=fuller example-tag
diff --git a/tests.branching/tag-creates-commit-and-tag.stdout b/tests.branching/tag-creates-commit-and-tag.stdout
deleted file mode 100644
index 335e6a31..00000000
--- a/tests.branching/tag-creates-commit-and-tag.stdout
+++ /dev/null
@@ -1,44 +0,0 @@
-test:morphs
-tag example-tag
-Tagger: developer <developer@example.com>
-Date:   Tue Jul 31 16:51:54 2012 +0000
-
-Message
-
-commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0
-Author: developer <developer@example.com>
-Date:   Tue Jul 31 16:51:54 2012 +0000
-
-    Message
-
-diff --git a/hello-stratum.morph b/hello-stratum.morph
-index e012b5f..50da61b 100644
---- a/hello-stratum.morph
-+++ b/hello-stratum.morph
-@@ -3,6 +3,7 @@ kind: stratum
- chunks:
- - name: hello
-   repo: test:hello
--  ref: master
-+  ref: 293fa0b08f0382c63181c36b6efa602876aa8c87
-+  unpetrify-ref: master
-   build-depends: []
-   build-mode: test
-
-test:morphs
-commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0
-Author:     developer <developer@example.com>
-AuthorDate: Tue Jul 31 16:51:54 2012 +0000
-Commit:     developer <developer@example.com>
-CommitDate: Tue Jul 31 16:51:54 2012 +0000
-
-    Message
-
-commit dc323150575be26e3df0d2dab678560c04281b9f
-Author:     developer <developer@example.com>
-AuthorDate: Tue Jul 31 16:51:54 2012 +0000
-Commit:     developer <developer@example.com>
-CommitDate: Tue Jul 31 16:51:54 2012 +0000
-
-    initial
-
diff --git a/tests.branching/tag-tag-works-as-expected.script b/tests.branching/tag-tag-works-as-expected.script
deleted file mode 100755
index 95315de4..00000000
--- a/tests.branching/tag-tag-works-as-expected.script
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#
-# 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.
-
-
-## Check that tagging an existing tag commit with 'morph tag' preserves
-## the unpetrify-ref and does not "double-petrify" apart from updating
-## references to "example-tag" to "tagged-tag".
-
-set -eu
-
-# Make sure the commits always have the same SHA1s.
-. "$SRCDIR/scripts/fix-committer-info"
-
-# Create a workspace and branch.
-cd "$DATADIR/workspace"
-"$SRCDIR/scripts/test-morph" init
-"$SRCDIR/scripts/test-morph" checkout test:morphs master
-
-# Tag the system branch.
-"$SRCDIR/scripts/test-morph" tag example-tag -- -m First
-
-# Check out the tag.
-"$SRCDIR/scripts/run-git-in" master/test/morphs checkout -b example-tag \
-    2>/dev/null
-
-# Tag the tag.
-"$SRCDIR/scripts/test-morph" tag tagged-tag -- -m Second
-
-# List all tags and show the second one.
-"$SRCDIR/scripts/test-morph" foreach -- git tag -l
-"$SRCDIR/scripts/test-morph" foreach -- git show tagged-tag
-"$SRCDIR/scripts/test-morph" foreach -- git log --format=fuller tagged-tag
diff --git a/tests.branching/tag-tag-works-as-expected.stdout b/tests.branching/tag-tag-works-as-expected.stdout
deleted file mode 100644
index c3d723d7..00000000
--- a/tests.branching/tag-tag-works-as-expected.stdout
+++ /dev/null
@@ -1,48 +0,0 @@
-test:morphs
-example-tag
-tagged-tag
-
-test:morphs
-tag tagged-tag
-Tagger: developer <developer@example.com>
-Date:   Tue Jul 31 16:51:54 2012 +0000
-
-Second
-
-commit ed4fa3a98076e92d61983202ed44455b3689bc16
-Author: developer <developer@example.com>
-Date:   Tue Jul 31 16:51:54 2012 +0000
-
-    Second
-
-diff --git a/hello-stratum.morph b/hello-stratum.morph
-index e012b5f..50da61b 100644
---- a/hello-stratum.morph
-+++ b/hello-stratum.morph
-@@ -3,6 +3,7 @@ kind: stratum
- chunks:
- - name: hello
-   repo: test:hello
--  ref: master
-+  ref: 293fa0b08f0382c63181c36b6efa602876aa8c87
-+  unpetrify-ref: master
-   build-depends: []
-   build-mode: test
-
-test:morphs
-commit ed4fa3a98076e92d61983202ed44455b3689bc16
-Author:     developer <developer@example.com>
-AuthorDate: Tue Jul 31 16:51:54 2012 +0000
-Commit:     developer <developer@example.com>
-CommitDate: Tue Jul 31 16:51:54 2012 +0000
-
-    Second
-
-commit dc323150575be26e3df0d2dab678560c04281b9f
-Author:     developer <developer@example.com>
-AuthorDate: Tue Jul 31 16:51:54 2012 +0000
-Commit:     developer <developer@example.com>
-CommitDate: Tue Jul 31 16:51:54 2012 +0000
-
-    initial
-
diff --git a/tests.build/bootstrap-mode.script b/tests.build/bootstrap-mode.script
deleted file mode 100755
index 0ac66220..00000000
--- a/tests.build/bootstrap-mode.script
+++ /dev/null
@@ -1,43 +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.
-
-
-## 'bootstrap' mode is similar to 'test' mode, but they should not be included
-## in the final stratum artifact. This feature is used to bootstrap the
-## build-essential stratum using the toolchain of the host.
-
-set -eu
-
-# Create a fake 'compiler' chunk to go into build-essential stratum
-"$SRCDIR/tests.build/setup-build-essential"
-
-"$SRCDIR/scripts/test-morph" build-morphology \
-    test:morphs-repo master hello-system
-
-cd "$DATADIR/cache/artifacts"
-echo "build-essential strata:"
-for stratum in $(find . -regex '.*\.stratum\.build-essential-[^.]*$' | sort)
-do
-    echo "$stratum"
-    sed 's/[a-f0-9]\{64\}/xxxx/g' "$stratum"
-    echo
-done
-echo
-echo "hello-system:"
-system=$(ls *hello-system-rootfs)
-tar tf "$system" | LC_ALL=C sort -u | sed '/^\.\/./s:^\./::' \
-    | grep -v '^baserock'
diff --git a/tests.build/bootstrap-mode.stdout b/tests.build/bootstrap-mode.stdout
deleted file mode 100644
index 26544a75..00000000
--- a/tests.build/bootstrap-mode.stdout
+++ /dev/null
@@ -1,13 +0,0 @@
-build-essential strata:
-./2271bef9cb222b1fd49bd2bcf3da435e02b4e0ce9fdddbcdf9358f608f51b547.stratum.build-essential-devel
-["xxxx.chunk.cc-devel", "xxxx.chunk.cc-doc"]
-./2a908a170acf10b4e9e131a007c8f3f0fa4961a7227c60793b3550c107f4c312.stratum.build-essential-runtime
-["xxxx.chunk.cc-bins", "xxxx.chunk.cc-libs", "xxxx.chunk.cc-locale", "xxxx.chunk.cc-misc"]
-
-hello-system:
-./
-etc/
-etc/os-release
-usr/
-usr/bin/
-usr/bin/hello
diff --git a/tests.build/setup b/tests.build/setup
index 8b1dfd0e..559825b1 100755
--- a/tests.build/setup
+++ b/tests.build/setup
@@ -107,7 +107,7 @@ cat <<EOF > hello-system.morph
 {
     "name": "hello-system",
     "kind": "system",
-    "arch": "$(uname -m)",
+    "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests.deploy/setup b/tests.deploy/setup
index 5fbe0262..ece8819a 100755
--- a/tests.deploy/setup
+++ b/tests.deploy/setup
@@ -112,7 +112,7 @@ cat <<EOF > hello-system.morph
 {
     "name": "hello-system",
     "kind": "system",
-    "arch": "$(uname -m)",
+    "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
     "strata": [
         {
             "morph": "hello-stratum",
@@ -148,7 +148,7 @@ cat <<EOF > linux-system.morph
 {
     "name": "linux-system",
     "kind": "system",
-    "arch": "$(uname -m)",
+    "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests.merging/setup b/tests.merging/setup
index 411fc45d..77b8bebc 100755
--- a/tests.merging/setup
+++ b/tests.merging/setup
@@ -51,7 +51,7 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
 {
     "name": "hello-system",
     "kind": "system",
-    "arch": "$(uname -m)",
+    "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests/show-dependencies.setup b/tests/show-dependencies.setup
index e1cc71ae..510656e6 100755
--- a/tests/show-dependencies.setup
+++ b/tests/show-dependencies.setup
@@ -347,7 +347,7 @@ cat <<EOF > xfce-system.morph
 {
   "name": "xfce-system",
   "kind": "system",
-  "arch": "$(uname -m)",
+  "arch": "$("$SRCDIR/scripts/test-morph" print-architecture)",
   "strata": [
     {
       "build-mode": "test",
diff --git a/yarns/deployment.yarn b/yarns/deployment.yarn
index a5da8ee5..fc21b826 100644
--- a/yarns/deployment.yarn
+++ b/yarns/deployment.yarn
@@ -54,7 +54,7 @@ the same code paths as a real upgrade.
     AND system test-system in cluster test-cluster in branch master has deployment type: rawdisk
     AND system test-system in cluster test-cluster in branch master has deployment location: test.tar
     WHEN the user builds the system test-system in branch master
-    AND the user attempts to deploy the cluster test-cluster in branch master with options test-system.DISK_SIZE=10M test-system.VERSION_LABEL=test1
+    AND the user attempts to deploy the cluster test-cluster in branch master with options test-system.DISK_SIZE=20M test-system.VERSION_LABEL=test1
     THEN morph succeeded
     WHEN the user attempts to upgrade the cluster test-cluster in branch master with options test-system.VERSION_LABEL=test2
     THEN morph succeeded