vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pseries test.

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-27 14:11:12 +02:00
parent a6393224c4
commit f25a2ba6b8
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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.

2
grub-core/lib/ieee1275/halt.c
View File

@ -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);

6
tests/pseries_test.in
View File

@ -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

2
tests/util/grub-shell.in
View File

@ -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=*)