--- trunk/grubby/test.sh	2013/10/21 14:00:03	2254
+++ trunk/grubby/test.sh	2014/07/16 10:38:09	2685
@@ -460,6 +460,18 @@
     grub2Test grub2.5 add/g2-1.5 --add-kernel=/boot/new-kernel.img \
         --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
         --copy-default
+    grub2Test grub2.12 add/g2-1.12 \
+        --add-kernel=/boot/vmlinuz-2.6.38.8-32.fc15.x86_64 \
+        --title='Linux, with Fedora 2.6.38.8-32.fc15.x86_64' \
+        --devtree='/boot/dtb-2.6.38.8-32.fc15.x86_64/foobarbaz.dtb' \
+        --initrd=/boot/initramfs-2.6.38.8-32.fc15.x86_64.img \
+        --boot-filesystem=/boot/ --copy-default --efi
+    grub2Test grub2.13 add/g2-1.13 \
+        --add-kernel=/boot/vmlinuz-2.6.38.8-32.fc15.x86_64 \
+        --title='Linux, with Fedora 2.6.38.8-32.fc15.x86_64' \
+        --devtree='/boot/dtb-2.6.38.8-32.fc15.x86_64/foobarbaz.dtb' \
+        --initrd=/boot/initramfs-2.6.38.8-32.fc15.x86_64.img \
+        --boot-filesystem=/boot/ --copy-default --efi
 
     testing="GRUB2 add initrd"
     grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
@@ -506,6 +518,19 @@
         "grub2-editenv test/grub2-support_files/env_temp list" \
         "saved_entry=Linux, with Fedora 2.6.38.8-32.fc15.x86_64"
 
+    testing="GRUB2 add kernel with default=saved_entry and a terrible title"
+    grub2Test grub2.7 add/g2-1.9 --env grubenv.1 \
+        --add-kernel=/boot/new-kernel.img \
+        --title='Fedora (3.10.3-300.fc19.x86_64) 19 (Schrödinger’s Cat)' \
+        --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
+        --copy-default
+
+    testing="GRUB2 set default with default=saved_entry and a terrible name"
+    grub2Test grub2.9 add/g2-1.9 --env grubenv.1 --set-default-index=0
+    commandTest "saved_default output" \
+        "grub2-editenv test/grub2-support_files/env_temp list" \
+        'saved_entry=Fedora (3.10.3-300.fc19.x86_64) 19 (Schrödinger’s Cat)'
+
     testing="GRUB2 set default with default=saved_entry"
     grub2Test grub2.8 add/g2-1.8 --env grubenv.1 --set-default-index=0
     commandTest "saved_default output" \
@@ -520,6 +545,25 @@
 
     testing="GRUB2 --default-title with default=saved_entry"
     grub2DisplayTest grub2.8 defaulttitle/g2.1 --env grubenv.1 --default-title
+
+    testing="GRUB2 --default-index with default=saved_entry and empty grubenv"
+    grub2DisplayTest grub2.8 defaultindex/0 --env grubenv.0 --default-index
+
+    testlinux16=n
+    case $ARCH in
+        ia32|x86_64) testlinux16=y ;;
+    esac
+
+    if [ "$testlinux16" == "y" ]; then
+        testing="GRUB2 add kernel with linux16"
+        grub2Test grub2.10 add/g2-1.10 --add-kernel=/boot/new-kernel.img \
+            --title='title' --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
+            --copy-default
+
+        testing="GRUB2 add initrd with linux16"
+        grub2Test grub2.11 add/g2-1.11 --update-kernel=/boot/new-kernel.img \
+            --initrd=/boot/new-initrd --boot-filesystem=/boot/
+    fi
 fi
 
 testing="YABOOT add kernel"