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

* tests/util/grub-shell.in: For powerpc tests put the CD-ROM as primary

Browse source 
master since with some combinations of qemu and firmware only primary
	IDE channel is available.
This commit is contained in:
Vladimir Serbinenko 2013-11-18 11:51:46 +01:00
parent f8b4c3b6b3
commit 256ee7ac6a
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* tests/util/grub-shell.in: For powerpc tests put the CD-ROM as primary
master since with some combinations of qemu and firmware only primary
IDE channel is available.
2013-11-18 Vladimir Serbinenko <phcoder@gmail.com> 2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/gfxterm_menu.c: Skip high-resolution tests on * grub-core/tests/gfxterm_menu.c: Skip high-resolution tests on

24
tests/util/grub-shell.in
View file

@ -354,39 +354,43 @@ if [ x$boot != xnet ] && [ x$boot != xemu ]; then
fi fi
if [ x$boot = xhd ]; then if [ x$boot = xhd ]; then
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = mips-arc ]; then if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = mips-arc ]; then
device=hdb device="hdb "
else else
device=hda device="hda "
fi fi
bootdev="-boot c" bootdev="-boot c"
fi fi
if [ x$boot = xcd ]; then if [ x$boot = xcd ]; then
device=cdrom if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ]; then
device="-drive if=ide,media=cdrom,file="
else
device="cdrom "
fi
bootdev="-boot d" bootdev="-boot d"
fi fi
if [ x$boot = xfd ]; then if [ x$boot = xfd ]; then
device=fda device="fda "
bootdev="-boot a" bootdev="-boot a"
fi fi
if [ x$boot = xqemu ]; then if [ x$boot = xqemu ]; then
bootdev="-bios ${rom_directory}/qemu.img" bootdev="-bios ${rom_directory}/qemu.img"
device=cdrom device="cdrom "
fi fi
if [ x$boot = xmipsel_qemu ]; then if [ x$boot = xmipsel_qemu ]; then
bootdev="-kernel ${rom_directory}/mipsel-qemu_mips.elf" bootdev="-kernel ${rom_directory}/mipsel-qemu_mips.elf"
device=cdrom device="cdrom "
fi fi
if [ x$boot = xmipsel_fulong2e ]; then if [ x$boot = xmipsel_fulong2e ]; then
bootdev="-kernel ${rom_directory}/mipsel-loongson.elf -append machtype=lemote-fuloong-2e" bootdev="-kernel ${rom_directory}/mipsel-loongson.elf -append machtype=lemote-fuloong-2e"
device=cdrom device="cdrom "
fi fi
if [ x$boot = xmips_qemu ]; then if [ x$boot = xmips_qemu ]; then
bootdev="-kernel ${rom_directory}/mips-qemu_mips.elf" bootdev="-kernel ${rom_directory}/mips-qemu_mips.elf"
device=cdrom device="cdrom "
fi fi
if [ x$boot = xcoreboot ]; then if [ x$boot = xcoreboot ]; then
@ -394,7 +398,7 @@ if [ x$boot = xcoreboot ]; then
cp "${GRUB_COREBOOT_ROM}" "${imgfile}" cp "${GRUB_COREBOOT_ROM}" "${imgfile}"
"${GRUB_CBFSTOOL}" "${imgfile}" add-payload "${rom_directory}/coreboot.elf" fallback/payload "${GRUB_CBFSTOOL}" "${imgfile}" add-payload "${rom_directory}/coreboot.elf" fallback/payload
bootdev="-bios ${imgfile}" bootdev="-bios ${imgfile}"
device=cdrom device="cdrom "
test -z "$debug" || echo "Coreboot image: ${imgfile}" >&2 test -z "$debug" || echo "Coreboot image: ${imgfile}" >&2
fi fi
@ -435,7 +439,7 @@ elif [ x$boot = xemu ]; then
@builddir@/grub-core/grub-emu -m "$device_map" -d "$grubdir" | tr -d "\r" | do_trim @builddir@/grub-core/grub-emu -m "$device_map" -d "$grubdir" | tr -d "\r" | do_trim
rm -rf "$grubdir" rm -rf "$grubdir"
else else
timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device} ${isofile} ${bootdev} | cat | tr -d "\r" | do_trim timeout -s KILL $timeout "${qemu}" ${qemuopts} ${serial_null} -serial file:/dev/stdout -${device}"${isofile}" ${bootdev} | cat | tr -d "\r" | do_trim
fi fi
if [ x$boot = xcoreboot ]; then if [ x$boot = xcoreboot ]; then
test -n "$debug" || rm -f "${imgfile}" test -n "$debug" || rm -f "${imgfile}"