summaryrefslogtreecommitdiff
path: root/tests.branching/setup
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-10 10:25:03 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 10:54:55 +0000
commitf366960273b026322f7e7cc3c1eb0cd632ebc73e (patch)
tree51449f8ad44217e8ad922158e47512bb4fb57ff0 /tests.branching/setup
parent8592fe5681fb131f05434d208133bbc82f8109e1 (diff)
downloadmorph-f366960273b026322f7e7cc3c1eb0cd632ebc73e.tar.gz
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.
Diffstat (limited to 'tests.branching/setup')
-rwxr-xr-xtests.branching/setup2
1 files changed, 1 insertions, 1 deletions
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