|
 |
31004e6 |
From 942ce2482508609d311410d6bc79316435512d16 Mon Sep 17 00:00:00 2001
|
|
|
31004e6 |
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
Date: Sat, 27 Apr 2013 14:11:12 +0200
|
|
|
f74b50e |
Subject: [PATCH 361/482] Fix pseries test.
|
|
|
31004e6 |
|
|
|
31004e6 |
---
|
|
|
31004e6 |
ChangeLog | 4 ++++
|
|
|
31004e6 |
grub-core/lib/ieee1275/halt.c | 2 +-
|
|
|
31004e6 |
tests/pseries_test.in | 6 +++---
|
|
|
31004e6 |
tests/util/grub-shell.in | 2 +-
|
|
|
31004e6 |
4 files changed, 9 insertions(+), 5 deletions(-)
|
|
|
31004e6 |
|
|
|
31004e6 |
diff --git a/ChangeLog b/ChangeLog
|
|
|
31004e6 |
index f4306c4..8c34cc0 100644
|
|
|
31004e6 |
--- a/ChangeLog
|
|
|
31004e6 |
+++ b/ChangeLog
|
|
|
31004e6 |
@@ -1,5 +1,9 @@
|
|
|
31004e6 |
2013-04-26 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
|
|
|
31004e6 |
+ Fix pseries test.
|
|
|
31004e6 |
+
|
|
|
31004e6 |
+2013-04-26 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
+
|
|
|
31004e6 |
Make 'make check' work on emu.
|
|
|
31004e6 |
|
|
|
31004e6 |
2013-04-26 Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
31004e6 |
diff --git a/grub-core/lib/ieee1275/halt.c b/grub-core/lib/ieee1275/halt.c
|
|
|
31004e6 |
index 7ede29d..8fc16d2 100644
|
|
|
31004e6 |
--- a/grub-core/lib/ieee1275/halt.c
|
|
|
31004e6 |
+++ b/grub-core/lib/ieee1275/halt.c
|
|
|
31004e6 |
@@ -25,8 +25,8 @@ grub_halt (void)
|
|
|
31004e6 |
{
|
|
|
31004e6 |
/* Not standardized. We try three known commands. */
|
|
|
31004e6 |
|
|
|
31004e6 |
- grub_ieee1275_interpret ("shut-down", 0);
|
|
|
31004e6 |
grub_ieee1275_interpret ("power-off", 0);
|
|
|
31004e6 |
+ grub_ieee1275_interpret ("shut-down", 0);
|
|
|
31004e6 |
grub_ieee1275_interpret ("poweroff", 0);
|
|
|
31004e6 |
|
|
|
31004e6 |
while (1);
|
|
|
31004e6 |
diff --git a/tests/pseries_test.in b/tests/pseries_test.in
|
|
|
31004e6 |
index 86a396a..2264945 100644
|
|
|
31004e6 |
--- a/tests/pseries_test.in
|
|
|
31004e6 |
+++ b/tests/pseries_test.in
|
|
|
31004e6 |
@@ -23,15 +23,15 @@ if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" != powerpc-ieee1275 ]
|
|
|
31004e6 |
exit 0
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
|
|
|
31004e6 |
-if [ "$(echo hello | "${grubshell}" --pseries --timeout 180 --boot=cd)" != "Hello World" ]; then
|
|
|
31004e6 |
+if [ "$(echo hello | "${grubshell}" --pseries --timeout=180 --boot=cd)" != "Hello World" ]; then
|
|
|
31004e6 |
exit 1
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
|
|
|
31004e6 |
-if [ "$(echo hello | "${grubshell}" --pseries --timeout 180 --boot=hd)" != "Hello World" ]; then
|
|
|
31004e6 |
+if [ "$(echo hello | "${grubshell}" --pseries --timeout=180 --boot=hd)" != "Hello World" ]; then
|
|
|
31004e6 |
exit 1
|
|
|
31004e6 |
fi
|
|
|
31004e6 |
|
|
|
31004e6 |
# FIXME: workaround SLOF bugs
|
|
|
31004e6 |
-#if [ "$(echo hello | "${grubshell}" --pseries --timeout 180 --boot=net)" != "Hello World" ]; then
|
|
|
31004e6 |
+#if [ "$(echo hello | "${grubshell}" --pseries --timeout=180 --boot=net)" != "Hello World" ]; then
|
|
|
31004e6 |
# exit 1
|
|
|
31004e6 |
#fi
|
|
|
31004e6 |
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
|
|
|
31004e6 |
index 7c88018..e00998a 100644
|
|
|
31004e6 |
--- a/tests/util/grub-shell.in
|
|
|
31004e6 |
+++ b/tests/util/grub-shell.in
|
|
|
31004e6 |
@@ -205,7 +205,7 @@ for option in "$@"; do
|
|
|
31004e6 |
qemu=qemu-system-ppc64
|
|
|
31004e6 |
serial_port=ieee1275/hvterm
|
|
|
31004e6 |
serial_null=
|
|
|
31004e6 |
- qemuopts="$qemuopts -no-reboot"
|
|
|
31004e6 |
+ qemuopts="$qemuopts -M pseries -no-reboot"
|
|
|
31004e6 |
trim=1
|
|
|
31004e6 |
;;
|
|
|
31004e6 |
--qemu-opts=*)
|
|
|
31004e6 |
--
|
|
|
31004e6 |
1.8.2.1
|
|
|
31004e6 |
|