diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-05 14:13:15 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-07-05 14:14:31 +0000 |
commit | 4e2af726dc83f55dfadad5f9d48729d060fa25d2 (patch) | |
tree | 865e45275da233fafc458a3722c89f0093026900 /tests.as-root | |
parent | db39f34c4c1b7ca5620f466c34e7fbf8a81709d6 (diff) | |
download | morph-4e2af726dc83f55dfadad5f9d48729d060fa25d2.tar.gz |
Black box tests: remove non-x86 special case
This removes the code preventing the tests being run on a non-x86
system, and makes the test system it tries to build be the same
architecture as itself.
System Build assumes x86 if arch is not specified for backwards compatibility
right now.
Diffstat (limited to 'tests.as-root')
-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 | 12 |
3 files changed, 1 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..13c55134 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" |