merge with mainline

tests/grub_script_echo1.in

@@ -57,3 +57,45 @@ e"$foo"${bar}o hello world
 
 foo=echo
 $foo 1234
+
+echo "one
+"
+echo "one
+\""
+echo "one
+two"
+
+echo one"two
+"three
+echo one"two
+\""three
+echo one"two
+\"three\"
+four"
+
+
+echo 'one
+'
+echo 'one
+\'
+echo 'one
+two'
+echo one'two
+'
+echo one'two
+\'
+echo one'two
+\'three
+
+# echo "one\
+# two"
+# echo 'one\
+# two'
+# echo foo\
+# bar
+# \
+# echo foo
+# echo "one
+#
+# two"
+

tests/util/grub-shell.in

@@ -44,7 +44,9 @@ Run GRUB script in a Qemu instance.
   -v, --version           print the version information and exit
   --boot=[fd|hd|cd]       boot method for Qemu instance
   --modules=MODULES       pre-load specified modules MODULES
+  --qemu=FILE             Name of qemu binary
   --qemu-opts=OPTIONS     extra options to pass to Qemu instance
+  --files=FILES           add files to the image
 
 $0 runs input GRUB script or SOURCE file in a Qemu instance and prints
 its output.
@@ -53,6 +55,9 @@ Report bugs to <bug-grub@gnu.org>.
 EOF
 }
 
+boot=hd
+qemu=qemu-system-i386
+
 # Check the arguments.
 for option in "$@"; do
     case "$option" in
@@ -65,14 +70,21 @@ for option in "$@"; do
     --modules=*)
 	ms=`echo "$option" | sed -e 's/--modules=//' -e 's/,/ /g'`
 	modules="$modules $ms" ;;
+    --files=*)
+	fls=`echo "$option" | sed -e 's/--files=//' -e 's/,/ /g'`
+	files="$files $fls" ;;
+    --qemu=*)
+	qemu=`echo "$option" | sed -e 's/--qemu=//' -e 's/,/ /g'`;;
     --qemu-opts=*)
         qs=`echo "$option" | sed -e 's/--qemu-opts=//'`
         qemuopts="$qemuopts $qs" ;;
     --boot=*)
         dev=`echo "$option" | sed -e 's/--boot=//'`
-	if   [ "$dev" = "fd" ] ; then bootdev=a;
-	elif [ "$dev" = "hd" ] ; then bootdev=c;
-	elif [ "$dev" = "cd" ] ; then bootdev=d;
+	if   [ "$dev" = "fd" ] ; then boot=fd;
+	elif [ "$dev" = "hd" ] ; then boot=hd;
+	elif [ "$dev" = "cd" ] ; then boot=cd;
+	elif [ "$dev" = "qemu" ] ; then boot=qemu;
+	elif [ "$dev" = "coreboot" ] ; then boot=coreboot;
 	else
 	    echo "Unrecognized boot method \`$dev'" 1>&2
 	    usage
@@ -100,10 +112,6 @@ if [ "x${source}" = x ] ; then
     source=${tmpfile}
 fi
 
-if [ "x${bootdev}" = x ] ; then
-    bootdev=c # default is boot as disk image
-fi
-
 cfgfile=`mktemp`
 cat <<EOF >${cfgfile}
 grubshell=yes
@@ -113,6 +121,8 @@ terminal_input serial
 terminal_output serial
 EOF
 
+rom_directory=`mktemp -d`
+
 for mod in ${modules}
 do
     echo "insmod ${mod}" >> ${cfgfile}
@@ -124,23 +134,44 @@ halt
 EOF
 
 isofile=`mktemp`
-sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
-  --override-directory=${builddir}/grub-core --output=${isofile} \
-  boot/grub/grub.cfg=${cfgfile} \
-  /boot/grub/testcase.cfg=${source} >/dev/null 2>&1
+sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \
+    --rom-directory="${rom_directory}" \
+    /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
+    ${files} >/dev/null 2>&1
+if [ x$boot = xhd ]; then
+    device=hda
+    bootdev="-boot c"
+fi
+if [ x$boot = xcd ]; then
+    device=cdrom
+    bootdev="-boot d"
+fi
+if [ x$boot = xfd ]; then
+    device=fda
+    bootdev="-boot a"
+fi
 
-hdafile=`mktemp`
-cp ${isofile} ${hdafile}
+if [ x$boot = xqemu ]; then
+    bootdev="-bios ${rom_directory}/qemu.img"
+    device=cdrom
+fi
 
-fdafile=`mktemp`
-cp ${isofile} ${fdafile}
+if [ x$boot = xcoreboot ]; then
+    imgfile=`mktemp`
+    cp "${GRUB_COREBOOT_ROM}" "${imgfile}"
+    "${GRUB_CBFSTOOL}" "${imgfile}" add-payload "${rom_directory}/coreboot.elf" fallback/payload
+    bootdev="-bios ${imgfile}"
+    device=cdrom
+fi
 
-outfile=`mktemp`
-qemu-system-i386 ${qemuopts} -nographic -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
+${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r"
+rm -f "${isofile}" "${imgfile}"
+rm -rf "${rom_directory}"
+if [ x$boot = xcoreboot ]; then
+    rm -f "${imgfile}"
+fi
 
-cat $outfile
-
-rm -f ${tmpfile} ${outfile} ${cfgfile} ${isofile} ${hdafile} ${fdafile}
+rm -f "${tmpfile}" "${cfgfile}"
 exit 0