diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-05 16:04:28 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-07-05 16:04:28 +0100 |
| commit | ad6cae07ae5320abd44b35e06a9a241c273bafe4 (patch) | |
| tree | 7281c737a0d7a9b1c05c4eef90b04553cced8419 | |
| parent | 0df9df152dc006f620ee738c6a5357baf0ae9f42 (diff) | |
| parent | 105fb6b224fe4962ce217b63c025f1d6a3c60aa1 (diff) | |
| download | morph-ad6cae07ae5320abd44b35e06a9a241c273bafe4.tar.gz | |
Merge remote branch 'origin/baserock/bugfix/S3298-arm-tests'
| -rwxr-xr-x | tests.as-root/make-patch.script | 11 | ||||
| -rwxr-xr-x | tests.as-root/setup | 1 | ||||
| -rwxr-xr-x | tests.as-root/system-overlap.script | 13 |
3 files changed, 2 insertions, 23 deletions
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index dcd1c7bf..b5385fc0 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -19,17 +19,6 @@ set -eu -# FIXME: This test currently only runs on x86 systems, because morph requires -# extlinux. -case "$(uname -m)" in - x86*) - ;; - *) - cat "$SRCDIR/tests.as-root/make-patch.stdout" - exit 0 - ;; -esac - # Make a stratum that include hello and kernel chunks. cat <<EOF > "$DATADIR/morphs-repo/hello-stratum.morph" { diff --git a/tests.as-root/setup b/tests.as-root/setup index 2ee2d7fa..b9c342fc 100755 --- a/tests.as-root/setup +++ b/tests.as-root/setup @@ -106,6 +106,7 @@ cat <<EOF > hello-system.morph { "name": "hello-system", "kind": "system", + "arch": "$(uname -m)", "disk-size": "1G", "strata": [ "hello-stratum" diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script index 7673ca74..8bef4050 100755 --- a/tests.as-root/system-overlap.script +++ b/tests.as-root/system-overlap.script @@ -20,18 +20,6 @@ set -eu -# FIXME: This test currently only runs on x86 systems, because morph requires -# extlinux. -case "$(uname -m)" in - x86*) - ;; - *) - cat "$SRCDIR/tests.as-root/system-overlap.stdout" - exit 0 - ;; -esac - - cache="$DATADIR/cache/artifacts" chunkrepo="$DATADIR/chunk-repo" morphsrepo="$DATADIR/morphs-repo" @@ -42,6 +30,7 @@ cat <<EOF >overlap-system.morph { "name": "overlap-system", "kind": "system", + "arch": "$(uname -m)", "disk-size": "1G", "strata": [ "foo-baz-stratum", |