From a825aaa0a7619ba17c73abbb1e043401ce70add3 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Wed, 25 Jul 2012 21:14:48 +0100 Subject: Remove arch specific test in syslinux-disk builder We only do this building on architectures we support, so there's no need for variation. --- tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'tests.as-root') diff --git a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script index 10b563a7..b9216009 100755 --- a/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script +++ b/tests.as-root/syslinux-disk-builds-rootfs-and-kernel.script @@ -20,6 +20,13 @@ set -eu +# We only support x86 systems with syslinux-disk. +arch=$(uname -m) +case "$arch" in + x86*) ;; + *) exit 0 ;; +esac + cache="$DATADIR/cache/artifacts" kernelrepo="$DATADIR/kernel-repo" morphsrepo="$DATADIR/morphs-repo" @@ -29,10 +36,10 @@ cd "$morphsrepo" git checkout --quiet -b custom master cat <system.morph { - "name": "x86_64-system", + "name": "system", "kind": "system", "system-kind": "syslinux-disk", - "arch": "x86_64", + "arch": "$(arch)", "disk-size": "1G", "strata": [ "stratum" -- cgit v1.2.1