uname tends to only give us a valid morph architecture on x86_64, this makes it work on other architectures. --- tests.as-root/metadata-includes-morph-version.setup | 2 +- tests.as-root/metadata-includes-repo-alias.setup | 2 +- tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script | 2 +- tests.as-root/setup | 4 ++-- tests.as-root/system-overlap.script | 2 +- tests.as-root/tarball-image-is-sensible.setup | 2 +- tests.branching/setup | 2 +- tests.build/setup | 2 +- tests.deploy/setup | 4 ++-- tests.merging/setup | 2 +- tests/show-dependencies.setup | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests.as-root/metadata-includes-morph-version.setup b/tests.as-root/metadata-includes-morph-version.setup index 31829b0..d7fc96e 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 31829b0..d7fc96e 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 20b6150..e082996 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/setup b/tests.as-root/setup index b865f42..1cf9dd0 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 c6154e0..1ce8379 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 505707b..c47a533 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 06a05e9..22c51c2 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.build/setup b/tests.build/setup index 8b1dfd0..559825b 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 5fbe026..ece8819 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 411fc45..77b8beb 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 e1cc71a..510656e 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", -- 1.8.5.rc2

They hard-code the expected sha1, so break the test suite for anything but x86_64. If we decide tag has a place in the new world order, yarns can be made, but until then, we're better off without these tests. --- tests.branching/tag-creates-commit-and-tag.script | 39 ------------------ tests.branching/tag-creates-commit-and-tag.stdout | 44 --------------------- tests.branching/tag-tag-works-as-expected.script | 46 ---------------------- tests.branching/tag-tag-works-as-expected.stdout | 48 ----------------------- 4 files changed, 177 deletions(-) delete mode 100755 tests.branching/tag-creates-commit-and-tag.script delete mode 100644 tests.branching/tag-creates-commit-and-tag.stdout delete mode 100755 tests.branching/tag-tag-works-as-expected.script delete mode 100644 tests.branching/tag-tag-works-as-expected.stdout 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 8fd45d1..0000000 --- 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 335e6a3..0000000 --- a/tests.branching/tag-creates-commit-and-tag.stdout +++ /dev/null @@ -1,44 +0,0 @@ -test:morphs -tag example-tag -Tagger: developer <developer(a)example.com&gt; -Date: Tue Jul 31 16:51:54 2012 +0000 - -Message - -commit 74b7fcdd21ac4756e473eb8a577caaabeab208b0 -Author: developer <developer(a)example.com&gt; -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(a)example.com&gt; -AuthorDate: Tue Jul 31 16:51:54 2012 +0000 -Commit: developer <developer(a)example.com&gt; -CommitDate: Tue Jul 31 16:51:54 2012 +0000 - - Message - -commit dc323150575be26e3df0d2dab678560c04281b9f -Author: developer <developer(a)example.com&gt; -AuthorDate: Tue Jul 31 16:51:54 2012 +0000 -Commit: developer <developer(a)example.com&gt; -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 95315de..0000000 --- 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 c3d723d..0000000 --- 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(a)example.com&gt; -Date: Tue Jul 31 16:51:54 2012 +0000 - -Second - -commit ed4fa3a98076e92d61983202ed44455b3689bc16 -Author: developer <developer(a)example.com&gt; -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(a)example.com&gt; -AuthorDate: Tue Jul 31 16:51:54 2012 +0000 -Commit: developer <developer(a)example.com&gt; -CommitDate: Tue Jul 31 16:51:54 2012 +0000 - - Second - -commit dc323150575be26e3df0d2dab678560c04281b9f -Author: developer <developer(a)example.com&gt; -AuthorDate: Tue Jul 31 16:51:54 2012 +0000 -Commit: developer <developer(a)example.com&gt; -CommitDate: Tue Jul 31 16:51:54 2012 +0000 - - initial - -- 1.8.5.rc2

This hard-coded the expected artifact key, which is dependent on architecture. Since we don't care about the output, so much as it failing, let's just discard it. --- tests.as-root/run-in-artifact-with-different-artifacts.script | 2 +- tests.as-root/run-in-artifact-with-different-artifacts.stderr | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 tests.as-root/run-in-artifact-with-different-artifacts.stderr 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 ff944af..57d408e 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 9241fbb..0000000 --- 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 -- 1.8.5.rc2