From 95df3b251b455843683b6e24aa4c76ed80beb724 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Fri, 14 Mar 2014 11:05:17 +0000
Subject: Revert "tests: Allow running ./check on 32-bit x86"

This reverts commit f366960273b026322f7e7cc3c1eb0cd632ebc73e.

These changes break building on x86_64, which is our main development
platform.

Better patches will be forthcoming later.
---
 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/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, 8 insertions(+), 8 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 d7fc96e3..31829b01 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": "$("$SRCDIR/scripts/test-morph" print-architecture)",
+    "arch": "$(uname -m)",
     "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 d7fc96e3..31829b01 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": "$("$SRCDIR/scripts/test-morph" print-architecture)",
+    "arch": "$(uname -m)",
     "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 e0829968..20b61507 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=$("$SRCDIR/scripts/test-morph" print-architecture)
+arch=$(uname -m)
 
 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 3995cc42..9241fbb5 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/b6c123860d8b1b84a39490b5ded7b792219be89bae3e09201bd10795ac509a21.stratum.linux-stratum-runtime cannot be extracted or mounted
+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 1cf9dd04..b865f42d 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: `"$SRCDIR/scripts/test-morph" print-architecture`
+arch: `uname -m`
 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: `"$SRCDIR/scripts/test-morph" print-architecture`
+arch: `uname -m`
 strata:
     - morph: hello-stratum
     - morph: linux-stratum
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 1ce8379d..c6154e0e 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": "$("$SRCDIR/scripts/test-morph" print-architecture)",
+  "arch": "$(uname -m)",
   "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 c47a5336..505707b3 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": "$("$SRCDIR/scripts/test-morph" print-architecture)",
+    "arch": "$(uname -m)",
     "strata": [
         {
             "morph": "link-stratum",
-- 
cgit v1.2.1