merged with mainline

tests/grub_script_blanklines.in

@@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+@builddir@/grub-script-check <<EOF
+# comment 1
+
+command1 arg1
+
+command2 arg2
+
+
+
+last command
+# comment 2
+EOF

tests/grub_script_final_semicolon.in

@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+@builddir@/grub-script-check <<EOF
+echo one;
+echo one; echo two
+echo one; echo two;
+echo one ; echo two ; 
+echo one ; echo two ; echo three 
+echo one; echo two ; echo three;   
+EOF

tests/util/grub-shell.in

@@ -135,7 +135,7 @@ fdafile=`mktemp`
 cp ${isofile} ${fdafile}
 
 outfile=`mktemp`
-qemu-system-i386 ${qemuopts} -nographic -serial stdio -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
+qemu-system-i386 ${qemuopts} -nographic -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
 
 cat $outfile