--- trunk/grubby/test.sh	2012/02/18 00:51:28	1720
+++ trunk/grubby/test.sh	2012/07/02 13:14:11	1857
@@ -74,16 +74,21 @@
 oneDisplayTest() {
     typeset mode=$1 cfg=test/$2 correct=test/results/$3
     shift 3
+    local BIO="--bad-image-okay"
+    if [ "$1" == "--bad-image-bad" ]; then
+        BIO=""
+        shift
+    fi
 
     echo "$testing ... $mode $cfg $correct"
-    runme=( ./grubby "$mode" --bad-image-okay -c "$cfg" "$@" )
-    if "${runme[@]}" | cmp "$correct" > /dev/null; then
+    runme=( ./grubby "$mode" $BIO -c "$cfg" "$@" )
+    if "${runme[@]}" 2>&1 | cmp "$correct" > /dev/null; then
 	(( pass++ ))
 	if $opt_verbose; then
 	    echo -------------------------------------------------------------
 	    echo -n "PASS: "
 	    printf "%q " "${runme[@]}"; echo
-	    "${runme[@]}" | diff -U30 "$cfg" -
+	    "${runme[@]}" 2>&1 | diff -U30 "$cfg" -
 	    echo
 	fi
     else
@@ -91,7 +96,7 @@
 	echo -------------------------------------------------------------
 	echo -n "FAIL: "
 	printf "%q " "${runme[@]}"; echo
-	"${runme[@]}" | diff -U30 "$correct" -
+	"${runme[@]}" 2>&1 | diff -U30 "$correct" -
 	echo
     fi
 }
@@ -121,6 +126,7 @@
 done
 
 export MALLOC_CHECK_=2
+export MALLOC_PERTURB_=1
 
 testing="Parse/write comparison"
 for n in test/*.[0-9]*; do
@@ -211,6 +217,19 @@
 grubDisplayTest grub.10 defaultindex/0 --default-index
 grubDisplayTest grub.10 defaultindex/0 --default-index
 
+testing="GRUB display default title"
+grubDisplayTest grub.1 defaulttitle/g.1 --default-title
+grubDisplayTest grub.2 defaulttitle/g.2 --default-title
+grubDisplayTest grub.3 defaulttitle/g.3 --default-title
+grubDisplayTest grub.4 defaulttitle/g.4 --default-title
+grubDisplayTest grub.5 defaulttitle/g.5 --default-title
+grubDisplayTest grub.6 defaulttitle/g.6 --default-title
+grubDisplayTest grub.7 defaulttitle/g.7 --default-title
+grubDisplayTest grub.8 defaulttitle/g.8 --default-title
+grubDisplayTest grub.9 defaulttitle/g.9 --default-title
+grubDisplayTest grub.10 defaulttitle/g.10 --default-title
+grubDisplayTest grub.11 defaulttitle/g.11 --default-title
+
 testing="LILO default directive"
 liloTest lilo.1 default/l1.1 --set-default=/boot/vmlinuz-2.4.18-4
 liloTest lilo.1 default/l1.2 --remove-kernel=/boot/vmlinuz-2.4.18-4smp
@@ -350,6 +369,10 @@
     --copy-default --make-default
 grub2Test grub2.1 add/g2-1.3 --add-kernel=/boot/new-kernel.img --title='title' \
     --boot-filesystem=/boot/ --copy-default --make-default
+grub2Test grub2.1 remove/g2-1.4 --remove-kernel=/boot/vmlinuz-2.6.38.2-9.fc15.x86_64 \
+    --boot-filesystem=/boot/
+grub2Test grub2.5 add/g2-1.5 --add-kernel=/boot/new-kernel.img --title='title' \
+    --initrd=/boot/new-initrd --boot-filesystem=/boot/ --copy-default
 
 testing="GRUB2 add initrd"
 grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
@@ -359,6 +382,27 @@
 grub2DisplayTest grub2.1 defaultindex/0 --default-index
 grub2DisplayTest grub2.2 defaultindex/0 --default-index
 
+testing="GRUB2 display default title"
+grub2DisplayTest grub2.1 defaulttitle/g2.1 --default-title
+grub2DisplayTest grub2.2 defaulttitle/g2.2 --default-title
+
+testing="GRUB2 display debug failure"
+grub2DisplayTest grub2.1 debug/g2.1 --bad-image-bad --boot-filesystem=/boot --default-kernel --debug
+testing="GRUB2 display debug success"
+grub2DisplayTest grub2.1 debug/g2.1.2 --boot-filesystem=/boot --default-kernel --debug
+
+testing="GRUB2 remove kernel via index"
+grub2Test grub2.3 remove/g2-1.1 --remove-kernel=1
+
+testing="GRUB2 remove kernel via title"
+grub2Test grub2.3 remove/g2-1.1 --remove-kernel="TITLE=title2"
+
+testing="GRUB2 (submenu) remove kernel via index"
+grub2Test grub2.4 remove/g2-1.2 --remove-kernel=2
+
+testing="GRUB2 (submenu) remove kernel via title"
+grub2Test grub2.4 remove/g2-1.2 --remove-kernel="TITLE=title2"
+
 testing="YABOOT add kernel"
 yabootTest yaboot.1 add/y1.1 --copy-default --boot-filesystem=/ --add-kernel=/boot/new-kernel  \
     --title=newtitle