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.deploy/setup | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests.deploy')

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",
-- 
cgit v1.2.1