* tests/util/grub-shell.in: Use escc-ch-a port on ppc.

diff --git a/ChangeLog b/ChangeLog
index 5a2e1481d116a0318aa7ce87615c2215146f8f88..a464af61ea318ff671e6200f36c142d893b75cb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * tests/util/grub-shell.in: Use escc-ch-a port on ppc.
+
 2012-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/powerpc/ieee1275/grub-mkrescue.in: Handle (and ignore)

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 0ff0dc9c9f099bbd2f617c7938977757ff2ee075..a1bf084d115cb35e1e9c7a765da03d27700366c7 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -59,7 +59,17 @@ EOF
 
 . "${builddir}/grub-core/modinfo.sh"
 qemuopts="${GRUB_QEMU_OPTS}"
+serial_port=com0
+serial_null=
 case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
+    powerpc-ieee1275)
+       boot=cd
+       qemu=qemu-system-ppc
+       console=console
+       serial_port=escc-ch-a
+       serial_null="-serial null"
+       ;;
+
     mips-qemu_mips)
        boot=mips_qemu
        qemu=qemu-system-mips
@@ -179,10 +189,10 @@ cfgfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
 cat <<EOF >${cfgfile}
 grubshell=yes
 insmod serial
-serial
-terminfo serial dumb
-terminal_input serial
-terminal_output serial
+serial ${serial_port}
+terminfo serial_${serial_port} dumb
+terminal_input serial_${serial_port}
+terminal_output serial_${serial_port}
 EOF
 
 trim_head=664cbea8-132f-4770-8aa4-1696d59ac35c
@@ -262,9 +272,9 @@ if [ x$boot = xnet ]; then
     pkgdatadir="@builddir@" sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--directory=${builddir}/grub-core" "--net-directory=$netdir"
     cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
     cp "${source}" "$netdir/boot/grub/testcase.cfg"
-    "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.0"  -net nic  | cat | tr -d "\r" | do_trim
+    "${qemu}" ${qemuopts} -nographic ${serial_null} -serial file:/dev/stdout -monitor file:/dev/null -boot n -net "user,tftp=$netdir,bootfile=/boot/grub/${grub_modinfo_target_cpu}-${grub_modinfo_platform}/core.0"  -net nic  | cat | tr -d "\r" | do_trim
 else
-    "${qemu}" ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r" | do_trim
+    "${qemu}" ${qemuopts} -nographic ${serial_null} -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} ${bootdev} | cat | tr -d "\r" | do_trim
 fi
 rm -f "${isofile}" "${imgfile}"
 rm -rf "${rom_directory}"