Tests: Support arm-efi

diff --git a/tests/ahci_test.in b/tests/ahci_test.in
index 40441768e0d121c12f01e877999185cf4196c662..1d01d1f59a0aac8911ff7ca3e62565f2dee5954d 100644 (file)
--- a/tests/ahci_test.in
+++ b/tests/ahci_test.in
@@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
     mips*-arc | mips*-qemu_mips)
        exit 0;;
     # FIXME: No native drivers are available for those
-    powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi)
+    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
        exit 0;;
 esac
 

diff --git a/tests/ehci_test.in b/tests/ehci_test.in
index 8de56ee98b2be94c7eba1862f978050e0cc1fb0d..7dd8d3e8fbd4a76b8efb88d69ecd8989546dc543 100644 (file)
--- a/tests/ehci_test.in
+++ b/tests/ehci_test.in
@@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
     mips*-arc | mips*-qemu_mips)
        exit 0;;
     # FIXME: No native drivers are available for those
-    powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi)
+    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
        exit 0;;
 esac
 

diff --git a/tests/ohci_test.in b/tests/ohci_test.in
index da517629f853bb6fc7b6e6a73f08040cb9e18613..7fede6f262c1fdac41609dc660017e279a06f3a1 100644 (file)
--- a/tests/ohci_test.in
+++ b/tests/ohci_test.in
@@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
     mips*-arc | mips*-qemu_mips)
        exit 0;;
     # FIXME: No native drivers are available for those
-    powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi)
+    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
        exit 0;;
 esac
 

diff --git a/tests/partmap_test.in b/tests/partmap_test.in
index 4230ba22859571d1d1b0b1ab5dc0939486c9e72d..f8dc456fb8c6c25d034c53821066ad618664afa0 100644 (file)
--- a/tests/partmap_test.in
+++ b/tests/partmap_test.in
@@ -88,6 +88,9 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
     mipsel-arc)
        disk=arc/scsi0/disk0/rdisk0
        ;;
+    arm*-efi)
+       disk=hd3
+       ;;
     *)
        disk=hd0
        ;;

diff --git a/tests/pata_test.in b/tests/pata_test.in
index 4bf644fe64f4f7635dced2c0020469a63bc2539f..c1d0f63ea21b5cdc6d818a1aabbd691a2e7a2fa5 100644 (file)
--- a/tests/pata_test.in
+++ b/tests/pata_test.in
@@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
     *-arc)
        exit 0;;
     # FIXME: No native drivers are available for those
-    powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi)
+    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
        exit 0;;
     i386-ieee1275)
        disk=hdb

diff --git a/tests/uhci_test.in b/tests/uhci_test.in
index 5ec503033f15b7ec8aff08a866d4ef7dd0ef5219..89e2c18051ac00f414edd0e80bdcfd911c8f9842 100644 (file)
--- a/tests/uhci_test.in
+++ b/tests/uhci_test.in
@@ -30,7 +30,7 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
     mips*-arc | mips*-qemu_mips)
        exit 0;;
     # FIXME: No native drivers are available for those
-    powerpc-ieee1275 | sparc64-ieee1275 | arm64-efi)
+    powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi)
        exit 0;;
 esac
 

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index cff597ea16e01fb53fb4af47c26567eb9d219024..5ba2c299cc3a9f66e32a1341fcf05ecd296a38f9 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -182,6 +182,15 @@ case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in
        disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
        serial_port=efi0
        ;;
+     arm-efi)
+       qemu=qemu-system-arm
+       boot=hd
+       console=console
+       trim=1
+       qemuopts="-machine virt -bios /usr/share/ovmf-arm/QEMU_EFI.fd $qemuopts"
+       disk="device virtio-blk-device,drive=hd1 -drive if=none,id=hd1,file="
+       serial_port=efi0
+       ;;
     *)
        boot=hd
        qemu=qemu-system-i386
@@ -233,7 +242,7 @@ for option in "$@"; do
            echo "(hd$disk)  $dsk" >> "$device_map"
            disk="$((disk+1))"
        else
-           if [ $disk = error ]; then
+           if [ "$disk" = error ]; then
                echo "Too many disks" 1>&2
                exit 1;
            fi
@@ -370,7 +379,7 @@ if [ x$boot != xnet ] && [ x$boot != xemu ]; then
        ${files} >/dev/null 2>&1
 fi
 if [ x$boot = xhd ]; then
-    if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ]; then
+    if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm-efi ]; then
        device="device virtio-blk-device,drive=hd0 -drive if=none,id=hd0,file="
     elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = mips-arc ]; then
        device="hdb "
@@ -380,7 +389,7 @@ if [ x$boot = xhd ]; then
     bootdev="-boot c"
 fi
 if [ x$boot = xcd ]; then
-    if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ]; then
+    if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm64-efi ] || [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = arm-efi ]; then
        device="device virtio-blk-device,drive=cd0 -drive if=none,id=cd0,media=cdrom,file="
     elif [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ] && [ x$pseries != xy ] ; then
        device="-drive if=ide,media=cdrom,file="