summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtests.as-root/make-patch.script11
-rwxr-xr-xtests.as-root/setup1
-rwxr-xr-xtests.as-root/system-overlap.script12
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"