--- trunk/grubby/test.sh	2012/02/18 00:57:49	1727
+++ trunk/grubby/test.sh	2012/07/02 13:18:33	1861
@@ -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,9 +126,15 @@
 done
 
 export MALLOC_CHECK_=2
+if [ -n "${RANDOM}" ]; then
+    export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
+else
+    export MALLOC_PERTURB_=1
+fi
 
 testing="Parse/write comparison"
 for n in test/*.[0-9]*; do
+    [ -d $n ] && continue
     n=${n#*/}	# remove test/
     b=${n%.*}	# remove suffix
     [[ $b == $opt_bootloader ]] || continue
@@ -198,6 +209,11 @@
 grubTest grub.4 default/g4.2 --boot-filesystem=/ --set-default=/boot/vmlinuz-2.4.7-ac3 --remove-kernel /boot/vmlinuz-2.4.7-2.5 --add-kernel=/boot/new-kernel --copy-default --title New_Title
 grubTest grub.6 default/g6.1 --remove-kernel=/boot/vmlinuz-2.4.7-2.9 --boot-filesystem=/
 
+testing="GRUB default index directive"
+grubTest grub.13 setdefaultindex/g.13.0 --set-default-index=0
+grubTest grub.13 setdefaultindex/g.13.1 --set-default-index=1
+grubTest grub.13 setdefaultindex/g.13.9 --set-default-index=9
+
 testing="GRUB display default index"
 grubDisplayTest grub.1 defaultindex/0 --default-index
 grubDisplayTest grub.2 defaultindex/0 --default-index
@@ -300,6 +316,12 @@
     --update-kernel=/vmlinuz-2.4.7-2smp \
     --args "ro root=LABEL=/ single"
 
+testing="GRUB lba and root information on SuSE systems"
+GRUBBY_SUSE_RELEASE=test/grub.12-support_files/etc/SuSE-release \
+    GRUBBY_SUSE_GRUB_CONF=test/grub.12-support_files/etc/grub.conf \
+    GRUBBY_GRUB_DEVICE_MAP=test/grub.12-support_files/boot/grub/device.map \
+    grubTest grub.12 info/g12.1 --info=0
+
 testing="LILO update kernel argument handling"
 liloTest lilo.1 updargs/l1.1 --update-kernel=/boot/vmlinuz-2.4.18-4 \
     --args="root=/dev/md1"
@@ -365,6 +387,8 @@
     --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 \
@@ -374,10 +398,32 @@
 grub2DisplayTest grub2.1 defaultindex/0 --default-index
 grub2DisplayTest grub2.2 defaultindex/0 --default-index
 
-testing="GRUB display default title"
+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="GRUB2 default index directive"
+grub2Test grub2.1 setdefaultindex/g2.1.0 --set-default-index=0
+grub2Test grub2.1 setdefaultindex/g2.1.1 --set-default-index=1
+grub2Test grub2.1 setdefaultindex/g2.1.9 --set-default-index=9
+
 testing="YABOOT add kernel"
 yabootTest yaboot.1 add/y1.1 --copy-default --boot-filesystem=/ --add-kernel=/boot/new-kernel  \
     --title=newtitle