From f366960273b026322f7e7cc3c1eb0cd632ebc73e Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 10 Mar 2014 10:25:03 +0000
Subject: tests: Allow running ./check on 32-bit x86

uname will return the same string morph expects as an architecture on
x86_64, but the canonical x86_32 architecture names match i?86 instead.

To make it work on 32-bit, we replace calls to uname with morph
print-architecture, which does the translation for us.
---
 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  | 4 ++--
 tests.as-root/run-in-artifact-with-different-artifacts.stderr | 2 +-
 tests.as-root/setup                                           | 4 ++--
 tests.as-root/system-overlap.script                           | 2 +-
 tests.as-root/tarball-image-is-sensible.setup                 | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tests.as-root')

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 93cd135f..e0829968 100755
--- a/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012, 2013  Codethink Limited
+# 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
@@ -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.stderr b/tests.as-root/run-in-artifact-with-different-artifacts.stderr
index 9241fbb5..3995cc42 100644
--- a/tests.as-root/run-in-artifact-with-different-artifacts.stderr
+++ b/tests.as-root/run-in-artifact-with-different-artifacts.stderr
@@ -1 +1 @@
-ERROR: Artifact TMP/cache/artifacts/e8e771e742c8f2199bd9f1e29cbeca07dbd51dd8880136d6521093711d37d8bf.stratum.linux-stratum-runtime cannot be extracted or mounted
+ERROR: Artifact TMP/cache/artifacts/b6c123860d8b1b84a39490b5ded7b792219be89bae3e09201bd10795ac509a21.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",
-- 
cgit v1.2.1