summaryrefslogtreecommitdiff
path: root/tests.deploy
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2014-03-14 16:45:25 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2014-03-14 17:07:10 +0000
commit2d3d24f66a216a714204aa3d208026f883c07464 (patch)
treef13ccb232a5ed2827d3ecdd29005f9af9a66b25e /tests.deploy
parentb280bc956adcaf7839088eec90ac80ae6bf2fe4a (diff)
downloadmorph-2d3d24f66a216a714204aa3d208026f883c07464.tar.gz
Use morph print-architecture to generate morphologies
uname tends to only give us a valid morph architecture on x86_64, this makes it work on other architectures.
Diffstat (limited to 'tests.deploy')
-rwxr-xr-xtests.deploy/setup4
1 files changed, 2 insertions, 2 deletions
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",