[Fedora-xen] [PATCH 5 of 6] Add test suite cases for elilo multiboot

[Aron Griffis]

# HG changeset patch
# User agriffis(a)cheo.zko.hp.com
# Node ID c21b0cf582a12df3f29601fca13f9ac82cf0ff06
# Parent  bbebf7a97ae1e13bb2b3bce3dcc999a7de53aa98
Add test suite cases for elilo multiboot

Additionally remove trailing whitespace from
grubby/test/results/updargs/g3.7 since the recent grubby changes allow
it to do a better job handling whitespace.

Signed-off-by: Aron Griffis <aron(a)hp.com&gt;

 grubby/test/elilo.1                |   25 +++++++++++++++++++++++++
 grubby/test/elilo.2                |   30 ++++++++++++++++++++++++++++++
 grubby/test/results/multiboot/e1.1 |   30 ++++++++++++++++++++++++++++++
 grubby/test/results/multiboot/e1.2 |   32 ++++++++++++++++++++++++++++++++
 grubby/test/results/multiboot/e2.1 |   26 ++++++++++++++++++++++++++
 grubby/test/results/multiboot/e2.2 |   25 +++++++++++++++++++++++++
 grubby/test/results/multiboot/e2.3 |   23 +++++++++++++++++++++++
 grubby/test.sh                     |   18 ++++++++++++++++++
 grubby/test/results/updargs/g3.7   |    4 ++--
 9 files changed, 211 insertions(+), 2 deletions(-)

diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test.sh
--- a/grubby/test.sh	Thu Jun 29 16:56:35 2006 -0400
+++ b/grubby/test.sh	Thu Jun 29 17:01:05 2006 -0400
@@ -334,6 +334,24 @@ grubTest grub.10 multiboot/g10.7 --boot-
 grubTest grub.10 multiboot/g10.7 --boot-filesystem=/boot \
     --remove-multiboot=/boot/xen.gz
 
+testing="ELILO add multiboot"
+eliloTest elilo.1 multiboot/e1.1 --add-multiboot=/boot/xen.gz \
+    --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \
+    --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \
+    --mbargs="dom0_mem=130000"
+eliloTest elilo.1 multiboot/e1.2 --add-multiboot=/boot/xen.gz \
+    --add-kernel=/boot/vmlinuz-2.6.10-1.1088_FC4 --boot-filesystem=/boot \
+    --initrd=/boot/initrd-2.6.10-1.1088_FC4.img --title foo \
+    --mbargs="dom0_mem=130000" --copy-default
+
+testing="ELILO remove multiboot"
+eliloTest elilo.2 multiboot/e2.1 --boot-filesystem=/boot \
+    --remove-kernel=/boot/vmlinuz-2.6.10-1.1076_FC4
+eliloTest elilo.2 multiboot/e2.2 --boot-filesystem=/boot \
+    --remove-kernel=/boot/vmlinuz-2.6.10-1.1082_FC4
+eliloTest elilo.2 multiboot/e2.3 --boot-filesystem=/boot \
+    --remove-multiboot=/boot/xen.gz
+
 printf "\n%d (%d%%) tests passed, %d (%d%%) tests failed\n" \
     $pass $(((100*pass)/(pass+fail))) \
     $fail $(((100*fail)/(pass+fail)))
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/updargs/g3.7
--- a/grubby/test/results/updargs/g3.7	Thu Jun 29 16:56:35 2006 -0400
+++ b/grubby/test/results/updargs/g3.7	Thu Jun 29 17:01:05 2006 -0400
@@ -3,11 +3,11 @@ splashimage=(hd0,1)/grub/splash.xpm.gz
 splashimage=(hd0,1)/grub/splash.xpm.gz
 title Red Hat Linux (2.4.7-2smp)
 	root (hd0,1)
-	kernel /vmlinuz-2.4.7-2smp 
+	kernel /vmlinuz-2.4.7-2smp
 	initrd /initrd-2.4.7-2smp.img
 title Red Hat Linux-up (2.4.7-2)
 	root (hd0,1)
-	kernel /vmlinuz-2.4.7-2 
+	kernel /vmlinuz-2.4.7-2
 	initrd /initrd-2.4.7-2.img
 title DOS
 	rootnoverify (hd0,0)
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/elilo.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grubby/test/elilo.1	Thu Jun 29 17:01:05 2006 -0400
@@ -0,0 +1,25 @@
+prompt
+timeout=50
+default=linux
+boot=/dev/md1
+map=/boot/map
+install=/boot/boot.b
+message=/boot/message
+linear
+
+disk=/dev/sdm
+	bios=0x80
+disk=/dev/sdn
+	bios=0x81
+
+image=/boot/vmlinuz-2.4.18-4
+	label=linux-up
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4.img
+
+image=/boot/vmlinuz-2.4.18-4smp
+	label=linux
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4smp.img
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/elilo.2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grubby/test/elilo.2	Thu Jun 29 17:01:05 2006 -0400
@@ -0,0 +1,30 @@
+prompt
+timeout=50
+default=linux
+boot=/dev/md1
+map=/boot/map
+install=/boot/boot.b
+message=/boot/message
+linear
+
+disk=/dev/sdm
+	bios=0x80
+disk=/dev/sdn
+	bios=0x81
+
+image=/vmlinuz-2.6.10-1.1076_FC4
+	label=foo
+	initrd=/initrd-2.6.10-1.1088_FC4.img
+	append="dom0_mem=130000 --"
+image=/boot/vmlinuz-2.4.18-4
+	label=linux-up
+	vmm=/xen.gz
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4.img
+
+image=/vmlinuz-2.6.10-1.1082_FC4
+	label=linux
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4smp.img
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e1.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grubby/test/results/multiboot/e1.1	Thu Jun 29 17:01:05 2006 -0400
@@ -0,0 +1,30 @@
+prompt
+timeout=50
+default=linux
+boot=/dev/md1
+map=/boot/map
+install=/boot/boot.b
+message=/boot/message
+linear
+
+disk=/dev/sdm
+	bios=0x80
+disk=/dev/sdn
+	bios=0x81
+
+image=/vmlinuz-2.6.10-1.1088_FC4
+	label=foo
+	vmm=/xen.gz
+	initrd=/initrd-2.6.10-1.1088_FC4.img
+	append="dom0_mem=130000 --"
+image=/boot/vmlinuz-2.4.18-4
+	label=linux-up
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4.img
+
+image=/boot/vmlinuz-2.4.18-4smp
+	label=linux
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4smp.img
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e1.2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grubby/test/results/multiboot/e1.2	Thu Jun 29 17:01:05 2006 -0400
@@ -0,0 +1,32 @@
+prompt
+timeout=50
+default=linux
+boot=/dev/md1
+map=/boot/map
+install=/boot/boot.b
+message=/boot/message
+linear
+
+disk=/dev/sdm
+	bios=0x80
+disk=/dev/sdn
+	bios=0x81
+
+image=/vmlinuz-2.6.10-1.1088_FC4
+	vmm=/xen.gz
+	label=foo
+	root=/dev/md0
+	read-only
+	initrd=/initrd-2.6.10-1.1088_FC4.img
+	append="dom0_mem=130000 --"
+image=/boot/vmlinuz-2.4.18-4
+	label=linux-up
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4.img
+
+image=/boot/vmlinuz-2.4.18-4smp
+	label=linux
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4smp.img
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e2.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grubby/test/results/multiboot/e2.1	Thu Jun 29 17:01:05 2006 -0400
@@ -0,0 +1,26 @@
+prompt
+timeout=50
+default=linux
+boot=/dev/md1
+map=/boot/map
+install=/boot/boot.b
+message=/boot/message
+linear
+
+disk=/dev/sdm
+	bios=0x80
+disk=/dev/sdn
+	bios=0x81
+
+image=/boot/vmlinuz-2.4.18-4
+	label=linux-up
+	vmm=/xen.gz
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4.img
+
+image=/vmlinuz-2.6.10-1.1082_FC4
+	label=linux
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4smp.img
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e2.2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grubby/test/results/multiboot/e2.2	Thu Jun 29 17:01:05 2006 -0400
@@ -0,0 +1,25 @@
+prompt
+timeout=50
+default=foo
+boot=/dev/md1
+map=/boot/map
+install=/boot/boot.b
+message=/boot/message
+linear
+
+disk=/dev/sdm
+	bios=0x80
+disk=/dev/sdn
+	bios=0x81
+
+image=/vmlinuz-2.6.10-1.1076_FC4
+	label=foo
+	initrd=/initrd-2.6.10-1.1088_FC4.img
+	append="dom0_mem=130000 --"
+image=/boot/vmlinuz-2.4.18-4
+	label=linux-up
+	vmm=/xen.gz
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4.img
+
diff -r bbebf7a97ae1 -r c21b0cf582a1 grubby/test/results/multiboot/e2.3
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/grubby/test/results/multiboot/e2.3	Thu Jun 29 17:01:05 2006 -0400
@@ -0,0 +1,23 @@
+prompt
+timeout=50
+default=linux
+boot=/dev/md1
+map=/boot/map
+install=/boot/boot.b
+message=/boot/message
+linear
+
+disk=/dev/sdm
+	bios=0x80
+disk=/dev/sdn
+	bios=0x81
+
+image=/vmlinuz-2.6.10-1.1076_FC4
+	label=foo
+	initrd=/initrd-2.6.10-1.1088_FC4.img
+	append="dom0_mem=130000 --"
+image=/vmlinuz-2.6.10-1.1082_FC4
+	label=linux
+	root=/dev/md0
+	read-only
+	initrd=/boot/initrd-2.4.18-4smp.img