Fix pseries test.

diff --git a/ChangeLog b/ChangeLog
index f4306c4b95ac0437f34b0ef7fb7139f10e6d571b..8c34cc0ad122f01cfd3fc4450ef70d2859f74efa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Fix pseries test.
+
 2013-04-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Make 'make check' work on emu.

diff --git a/grub-core/lib/ieee1275/halt.c b/grub-core/lib/ieee1275/halt.c
index 7ede29de98a345e1519c608dbd3cd90122b776ef..8fc16d2438efc0813f727b82a7895a72a554cdb1 100644 (file)
--- a/grub-core/lib/ieee1275/halt.c
+++ b/grub-core/lib/ieee1275/halt.c
@@ -25,8 +25,8 @@ grub_halt (void)
 {
   /* Not standardized.  We try three known commands.  */
 
-  grub_ieee1275_interpret ("shut-down", 0);
   grub_ieee1275_interpret ("power-off", 0);
+  grub_ieee1275_interpret ("shut-down", 0);
   grub_ieee1275_interpret ("poweroff", 0);
 
   while (1);

diff --git a/tests/pseries_test.in b/tests/pseries_test.in
index 86a396a853a8b6d29125eb743160cdd59503649e..226494593d1514112f33eee695c3c418421198c1 100644 (file)
--- a/tests/pseries_test.in
+++ b/tests/pseries_test.in
@@ -23,15 +23,15 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" != powerpc-ieee1275 ]
    exit 0
 fi
 
-if [ "$(echo hello | "${grubshell}" --pseries --timeout 180 --boot=cd)" != "Hello World" ]; then
+if [ "$(echo hello | "${grubshell}" --pseries --timeout=180 --boot=cd)" != "Hello World" ]; then
    exit 1
 fi
 
-if [ "$(echo hello | "${grubshell}" --pseries --timeout 180 --boot=hd)" != "Hello World" ]; then
+if [ "$(echo hello | "${grubshell}" --pseries --timeout=180 --boot=hd)" != "Hello World" ]; then
    exit 1
 fi
 
 # FIXME: workaround SLOF bugs
-#if [ "$(echo hello | "${grubshell}" --pseries --timeout 180 --boot=net)" != "Hello World" ]; then
+#if [ "$(echo hello | "${grubshell}" --pseries --timeout=180 --boot=net)" != "Hello World" ]; then
 #   exit 1
 #fi

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 7c88018350bbd37c93c914b96b7cc7ed7192d3c7..e00998a8e8da62ba1e1bd276335aa7842e7274b1 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -205,7 +205,7 @@ for option in "$@"; do
        qemu=qemu-system-ppc64
        serial_port=ieee1275/hvterm
        serial_null=
-       qemuopts="$qemuopts -no-reboot"
+       qemuopts="$qemuopts -M pseries -no-reboot"
        trim=1
            ;;
     --qemu-opts=*)