[PATCH] locate the qemu binary in the grub-shell test

[Dustin Kirkland <kirkland@canonical.com>]

[-- Attachment #1: Type: text/plain, Size: 1550 bytes --]

The grub-shell test assumes that qemu-system-i386 will be the binary
used, and that it's available on the system.  Actually, on amd64/x86_64
systems, the appropriate binary is qemu-system-x86_64.  Furthermore, an
appropriate error should be thrown if neither executable is found.

2010-02-20  Dustin Kirkland <kirkland@canonical.com>

        * tests/util/grub-shell.in: locate the appropriate qemu system 
          binary, and exit non-zero, with an error message, if none are 
          found

diff -Nur -x '*.orig' -x '*~' lucid/tests/util/grub-shell.in lucid.new/tests/util/grub-shell.in
--- lucid/tests/util/grub-shell.in	2010-02-20 07:58:35.062756000 -0600
+++ lucid.new/tests/util/grub-shell.in	2010-02-20 08:22:07.797858157 -0600
@@ -92,6 +92,18 @@
     esac
 done
 
+qemu=
+for i in qemu-system-i386 qemu-system-x86_64; do
+    if which ${i} >/dev/null; then
+	qemu=${i}
+	break
+    fi
+done
+if [ "x${qemu}" = x ]; then
+    echo "qemu is not installed" 1>&2
+    exit 1
+fi
+
 if [ "x${source}" = x ] ; then
     tmpfile=`mktemp`
     while read; do
@@ -135,8 +147,7 @@
 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} ${qemuopts} -nographic -serial stdio -hda ${hdafile} -fda ${fdafile} -cdrom ${isofile} -boot ${bootdev} | tr -d "\r" >${outfile}
 cat $outfile
 
 rm -f ${tmpfile} ${outfile} ${cfgfile} ${isofile} ${hdafile} ${fdafile}


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 198 bytes --]