summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-25 20:31:14 +0100
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2012-07-26 12:00:34 +0100
commit83ae051980cbdf1e64af5b83698a12270f9748b7 (patch)
tree4f2b8b668f06b1b2e65bcf728963d7116da75ff3
parent45792fe9fc1f79325719bad1ec21e90423235300 (diff)
downloadmorph-83ae051980cbdf1e64af5b83698a12270f9748b7.tar.gz
Modify test case for rootfs-tarball (instead of just arm)
-rwxr-xr-xtests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script (renamed from tests.as-root/arm-system-writes-kernel.script)7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests.as-root/arm-system-writes-kernel.script b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
index 2f6a5f69..680bee68 100755
--- a/tests.as-root/arm-system-writes-kernel.script
+++ b/tests.as-root/rootfs-tarball-builds-rootfs-and-kernel.script
@@ -1,6 +1,7 @@
#!/bin/sh
#
-# If the system's arch is arm, it should write the kernel to the cache
+# A system-kind of rootfs-tarball should build both kernel image and
+# a tarball with the root filesystem.
#
# Copyright (C) 2011, 2012 Codethink Limited
#
@@ -30,7 +31,7 @@ cat <<EOF >arm-system.morph
{
"name": "arm-system",
"kind": "system",
- "system-kind": "syslinux-disk",
+ "system-kind": "rootfs-tarball",
"arch": "arm",
"disk-size": "1G",
"strata": [
@@ -80,3 +81,5 @@ git commit --quiet -m 'Make the kernel create a dummy zImage'
"$SRCDIR/scripts/test-morph" \
build test:morphs-repo arm arm-system.morph > /dev/null
[ -e "$cache"/*system.arm-system-kernel ] || find "$cache"
+[ -e "$cache"/*system.arm-system-rootfs ] || find "$cache"
+