summaryrefslogtreecommitdiff
path: root/tests.as-root
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.as-root
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.as-root')
-rwxr-xr-xtests.as-root/metadata-includes-morph-version.setup2
-rwxr-xr-xtests.as-root/metadata-includes-repo-alias.setup2
-rwxr-xr-xtests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script2
-rwxr-xr-xtests.as-root/setup4
-rwxr-xr-xtests.as-root/system-overlap.script2
-rwxr-xr-xtests.as-root/tarball-image-is-sensible.setup2
6 files changed, 7 insertions, 7 deletions
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 20b61507..e0829968 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=$(uname -m)
+arch=$("$SRCDIR/scripts/test-morph" print-architecture)
cd "$DATADIR/kernel-repo"
cat <<EOF >linux.morph
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",