Skip to contentSkip to conversation

tests: Add functional tests for HPPA machines

PATCH In review Philippe Mathieu-Daudé 4 participants 7 messages Jan 2, 2025 – Jan 9, 2025 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

v6 cover tests: Add functional tests for HPPA machines

Since v5:
- Correct boot-serial-test machine name for stable (th_huth)

Philippe Mathieu-Daudé (2):
tests/qtest/boot-serial-test: Correct HPPA machine name
tests: Add functional tests for HPPA machines

 MAINTAINERS                           |  1 +
 tests/qtest/boot-serial-test.c        |  2 --
 tests/functional/meson.build          |  4 +++
 tests/functional/test_hppa_seabios.py | 35 +++++++++++++++++++++++++++
 tests/qtest/meson.build               |  2 +-
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100755 tests/functional/test_hppa_seabios.py
Signature · 1 line
2.47.1
#1 lore raw

PATCH v6 1/2 tests/qtest/boot-serial-test: Correct HPPA machine name

Commit 7df6f751176 ("hw/hppa: Split out machine creation") renamed the 'hppa' machine as 'B160L', but forgot to update the boot serial test, which ended being skipped.

Fixes 7df6f751176 ("hw/hppa: Split out machine creation")
---
 tests/qtest/boot-serial-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/qtest/boot-serial-test.c +1 -1
index 3b92fa5d506..7759e8c9702 100644
@@ -185,7 +185,7 @@ static const testdef_t tests[] = {
       sizeof(kernel_plml605), kernel_plml605 },
     { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },
     /* For hppa, force bios to output to serial by disabling graphics. */
-    { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" },
+    { "hppa", "B160L", "-vga none", "SeaBIOS wants SYSTEM HALT" },
     { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64),
       kernel_aarch64 },
     { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 },
Signature · 1 line
2.47.1
Reviewed-by on v6 1/2
#2 lore raw

Re: [PATCH v6 1/2] tests/qtest/boot-serial-test: Correct HPPA machine name

Quoted 17 lines · Philippe Mathieu-Daudé

Commit 7df6f751176 ("hw/hppa: Split out machine creation") renamed the 'hppa' machine as 'B160L', but forgot to update the boot serial test, which ended being skipped.

Fixes 7df6f751176 ("hw/hppa: Split out machine creation")
---
  tests/qtest/boot-serial-test.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tests/qtest/boot-serial-test.c +0 -0
index 3b92fa5d506..7759e8c9702 100644

tests/qtest/boot-serial-test.c static const testdef_t tests[] = { · line 191

Quoted 8 lines
tests/qtest/boot-serial-test.c +1 -1
@@ -185,7 +185,7 @@ static const testdef_t tests[] = {
        sizeof(kernel_plml605), kernel_plml605 },
      { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },
      /* For hppa, force bios to output to serial by disabling graphics. */
-    { "hppa", "hppa", "-vga none", "SeaBIOS wants SYSTEM HALT" },
+    { "hppa", "B160L", "-vga none", "SeaBIOS wants SYSTEM HALT" },
      { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64),
        kernel_aarch64 },
      { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 },
#3 lore raw

PATCH v6 2/2 tests: Add functional tests for HPPA machines

In reply to Philippe Mathieu-Daudé

Add quick firmware boot tests (less than 1sec) for the B160L (32-bit) and C3700 (64-bit) HPPA machines:

  $ make check-functional-hppa
  ...
  4/4 qemu:func-quick+func-hppa / func-hppa-hppa_seabios    OK 0.22s 2 subtests passed

Remove the duplicated B160L test in qtest/boot-serial-test.c.

---
 MAINTAINERS                           |  1 +
 tests/qtest/boot-serial-test.c        |  2 --
 tests/functional/meson.build          |  4 +++
 tests/functional/test_hppa_seabios.py | 35 +++++++++++++++++++++++++++
 tests/qtest/meson.build               |  2 +-
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100755 tests/functional/test_hppa_seabios.py
MAINTAINERS +1 -0
index 2101b512175..770bbf9f233 100644
@@ -1203,6 +1203,7 @@ F: include/hw/pci-host/astro.h
 F: include/hw/pci-host/dino.h
 F: pc-bios/hppa-firmware.img
 F: roms/seabios-hppa/
+F: tests/functional/test_hppa_seabios.py
 
 LoongArch Machines
 ------------------
tests/qtest/boot-serial-test.c +0 -2
index 7759e8c9702..7ea24855072 100644
@@ -184,8 +184,6 @@ static const testdef_t tests[] = {
     { "microblazeel", "petalogix-ml605", "", "TT",
       sizeof(kernel_plml605), kernel_plml605 },
     { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 },
-    /* For hppa, force bios to output to serial by disabling graphics. */
-    { "hppa", "B160L", "-vga none", "SeaBIOS wants SYSTEM HALT" },
     { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64),
       kernel_aarch64 },
     { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 },
tests/functional/meson.build +4 -0
index 24f7f8f2f1c..71810a3aa82 100644
@@ -104,6 +104,10 @@ tests_avr_system_thorough = [
   'avr_mega2560',
 ]
 
+tests_hppa_system_quick = [
+  'hppa_seabios',
+]
+
 tests_i386_system_thorough = [
   'i386_tuxrun',
 ]
tests/functional/test_hppa_seabios.py new file +35 -0
new file mode 100755
index 00000000000..a44d1a3eebe
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+#
+# SeaBIOS boot test for HPPA machines
+#
+# Copyright (c) 2024 Linaro, Ltd
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from qemu_test import QemuSystemTest
+from qemu_test import wait_for_console_pattern
+
+class HppaSeabios(QemuSystemTest):
+
+    timeout = 5
+    MACH_BITS = {'B160L': 32, 'C3700': 64}
+
+    def boot_seabios(self):
+        mach = self.machine
+        bits = self.MACH_BITS[mach]
+        self.vm.set_console()
+        self.vm.launch()
+        self.machine
+        wait_for_console_pattern(self, f'SeaBIOS PA-RISC {bits}-bit Firmware')
+        wait_for_console_pattern(self, f'Emulated machine:     HP {mach} ({bits}-bit')
+
+    def test_hppa_32(self):
+        self.set_machine('B160L')
+        self.boot_seabios()
+
+    def test_hppa_64(self):
+        self.set_machine('C3700')
+        self.boot_seabios()
+
+if __name__ == '__main__':
+    QemuSystemTest.main()
tests/qtest/meson.build +1 -1
index c5a70021c50..ab296a97a78 100644
@@ -140,7 +140,7 @@ qtests_alpha = ['boot-serial-test'] + \
 
 qtests_avr = [ 'boot-serial-test' ]
 
-qtests_hppa = ['boot-serial-test'] + \
+qtests_hppa = \
   qtests_filter + \
   (config_all_devices.has_key('CONFIG_VGA') ? ['display-vga-test'] : [])
 
Signature · 1 line
2.47.1
Reviewed-by on the v6 series
#4 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 7 lines · Philippe Mathieu-Daudé

Since v5:
- Correct boot-serial-test machine name for stable (th_huth)

Philippe Mathieu-Daudé (2):
tests/qtest/boot-serial-test: Correct HPPA machine name
tests: Add functional tests for HPPA machines

Quoted 8 lines
  MAINTAINERS                           |  1 +
  tests/qtest/boot-serial-test.c        |  2 --
  tests/functional/meson.build          |  4 +++
  tests/functional/test_hppa_seabios.py | 35 +++++++++++++++++++++++++++
  tests/qtest/meson.build               |  2 +-
  5 files changed, 41 insertions(+), 3 deletions(-)

create mode 100755 tests/functional/test_hppa_seabios.py

r~

#5 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 6 lines · Philippe Mathieu-Daudé

Since v5:
- Correct boot-serial-test machine name for stable (th_huth)

Philippe Mathieu-Daudé (2):
tests/qtest/boot-serial-test: Correct HPPA machine name
tests: Add functional tests for HPPA machines

Fabiano, if you don't object, I'm queuing this via my hw-misc tree.

Regards,

Phil.

#6 lore raw
Quoted 10 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Philippe Mathieu-Daudé

Since v5:
- Correct boot-serial-test machine name for stable (th_huth)

Philippe Mathieu-Daudé (2):
tests/qtest/boot-serial-test: Correct HPPA machine name
tests: Add functional tests for HPPA machines

Fabiano, if you don't object, I'm queuing this via my hw-misc tree.

Sure, go ahead, thanks!

Quoted 3 lines

Regards,

Phil.