Skip to contentSkip to conversation

Add more tests to the boot-serial tester

PATCH In review Thomas Huth 2 participants 6 messages Feb 1, 2018 – Feb 3, 2018

lore
Share & tools
lore
#0 lore raw

cover Add more tests to the boot-serial tester

First patch adds new tests for the SPARC machines, second patch enables the Mac machines, too, and the third patch adds a test for the brand-new hppa softmmu machine.

Thomas Huth (3):
tests/boot-serial: Enable the boot-serial test on SPARC machines, too tests/boot-serial: Add tests for PowerPC Mac machines tests/boot-serial: Add a test for the new hppa-softmmu target

 tests/Makefile.include   | 4 ++++
 tests/boot-serial-test.c | 8 ++++++++
 2 files changed, 12 insertions(+)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/3 tests/boot-serial: Enable the boot-serial test on SPARC machines, too

OpenBIOS prints out the name of the detected CPU here, so looking for this string is a nice test to verify that the CPU detection is still working correctly.

---
 tests/Makefile.include   | 2 ++
 tests/boot-serial-test.c | 4 ++++
 2 files changed, 6 insertions(+)
tests/Makefile.include +2 -0
index ca82e0c..0b98dd7 100644
@@ -350,11 +350,13 @@ check-qtest-sh4eb-y = tests/endianness-test$(EXESUF)
 check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
 #check-qtest-sparc-y += tests/m48t59-test$(EXESUF)
 #gcov-files-sparc-y = hw/timer/m48t59.c
+check-qtest-sparc-y += tests/boot-serial-test$(EXESUF)
 
 check-qtest-sparc64-y = tests/endianness-test$(EXESUF)
 #check-qtest-sparc64-y += tests/m48t59-test$(EXESUF)
 #gcov-files-sparc64-y += hw/timer/m48t59.c
 check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
+check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF)
 
 check-qtest-arm-y = tests/tmp105-test$(EXESUF)
 check-qtest-arm-y += tests/ds1338-test$(EXESUF)
tests/boot-serial-test.c +4 -0
index 418c5b9..abc7f2d 100644
@@ -78,6 +78,10 @@ static testdef_t tests[] = {
     { "i386", "q35", "-device sga", "SGABIOS" },
     { "x86_64", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
     { "x86_64", "q35", "-device sga", "SGABIOS" },
+    { "sparc", "LX", "", "TMS390S10" },
+    { "sparc", "SS-4", "", "MB86904" },
+    { "sparc", "SS-600MP", "", "TMS390Z55" },
+    { "sparc64", "sun4u", "", "UltraSPARC" },
     { "s390x", "s390-ccw-virtio",
       "-nodefaults -device sclpconsole,chardev=serial0", "virtio device" },
     { "m68k", "mcf5208evb", "", "TT", sizeof(kernel_mcf5208), kernel_mcf5208 },
Signature · 1 line
1.8.3.1
Acked-by on v1 1/3
#2 lore raw

Re: [Qemu-devel] [PATCH 1/3] tests/boot-serial: Enable the boot-serial test on SPARC machines, too

Quoted 34 lines · Thomas Huth

OpenBIOS prints out the name of the detected CPU here, so looking for this string is a nice test to verify that the CPU detection is still working correctly.

---
  tests/Makefile.include   | 2 ++
  tests/boot-serial-test.c | 4 ++++
  2 files changed, 6 insertions(+)
tests/Makefile.include +2 -0
index ca82e0c..0b98dd7 100644
@@ -350,11 +350,13 @@ check-qtest-sh4eb-y = tests/endianness-test$(EXESUF)
  check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
  #check-qtest-sparc-y += tests/m48t59-test$(EXESUF)
  #gcov-files-sparc-y = hw/timer/m48t59.c
+check-qtest-sparc-y += tests/boot-serial-test$(EXESUF)
 
  check-qtest-sparc64-y = tests/endianness-test$(EXESUF)
  #check-qtest-sparc64-y += tests/m48t59-test$(EXESUF)
  #gcov-files-sparc64-y += hw/timer/m48t59.c
  check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
+check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF)
 
  check-qtest-arm-y = tests/tmp105-test$(EXESUF)
  check-qtest-arm-y += tests/ds1338-test$(EXESUF)
tests/boot-serial-test.c +0 -0
index 418c5b9..abc7f2d 100644

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

Quoted 10 lines
tests/boot-serial-test.c +4 -0
@@ -78,6 +78,10 @@ static testdef_t tests[] = {
      { "i386", "q35", "-device sga", "SGABIOS" },
      { "x86_64", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
      { "x86_64", "q35", "-device sga", "SGABIOS" },
+    { "sparc", "LX", "", "TMS390S10" },
+    { "sparc", "SS-4", "", "MB86904" },
+    { "sparc", "SS-600MP", "", "TMS390Z55" },
+    { "sparc64", "sun4u", "", "UltraSPARC" },
      { "s390x", "s390-ccw-virtio",
        "-nodefaults -device sclpconsole,chardev=serial0", "virtio device" },
      { "m68k", "mcf5208evb", "", "TT", sizeof(kernel_mcf5208), kernel_mcf5208 },

Why not?

ATB,

Mark.

#3 lore raw

PATCH 2/3 tests/boot-serial: Add tests for PowerPC Mac machines

In reply to Thomas Huth

OpenBIOS prints out the CPU type on these machine types, so we can use this string to test whether the CPU detection is working correctly.

---
 tests/boot-serial-test.c | 3 +++
 1 file changed, 3 insertions(+)
tests/boot-serial-test.c +3 -0
index abc7f2d..12bf6ec 100644
@@ -69,8 +69,11 @@ static testdef_t tests[] = {
     { "alpha", "clipper", "", "PCI:" },
     { "ppc", "ppce500", "", "U-Boot" },
     { "ppc", "prep", "", "Open Hack'Ware BIOS" },
+    { "ppc", "g3beige", "", "PowerPC,750" },
+    { "ppc", "mac99", "", "PowerPC,G4" },
     { "ppc64", "ppce500", "", "U-Boot" },
     { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
+    { "ppc64", "mac99", "", "PowerPC,970FX" },
     { "ppc64", "pseries", "", "Open Firmware" },
     { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
     { "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
Signature · 1 line
1.8.3.1
Acked-by on v1 2/3
#4 lore raw

Re: [Qemu-devel] [PATCH 2/3] tests/boot-serial: Add tests for PowerPC Mac machines

Quoted 15 lines · Thomas Huth

OpenBIOS prints out the CPU type on these machine types, so we can use this string to test whether the CPU detection is working correctly.

---
  tests/boot-serial-test.c | 3 +++
  1 file changed, 3 insertions(+)
tests/boot-serial-test.c +0 -0
index abc7f2d..12bf6ec 100644
@@ -69,8 +69,11 @@ static testdef_t tests[] = {
      { "alpha", "clipper", "", "PCI:" },

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

Quoted 10 lines
tests/boot-serial-test.c +3 -0
      { "ppc", "ppce500", "", "U-Boot" },
      { "ppc", "prep", "", "Open Hack'Ware BIOS" },
+    { "ppc", "g3beige", "", "PowerPC,750" },
+    { "ppc", "mac99", "", "PowerPC,G4" },
      { "ppc64", "ppce500", "", "U-Boot" },
      { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
+    { "ppc64", "mac99", "", "PowerPC,970FX" },
      { "ppc64", "pseries", "", "Open Firmware" },
      { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
      { "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },

ATB,

Mark.

#5 lore raw

PATCH 3/3 tests/boot-serial: Add a test for the new hppa-softmmu target

In reply to Thomas Huth

The hppa machine comes with a firmware image, so we can easily include this in the boot-serial tester, too.

---
 tests/Makefile.include   | 2 ++
 tests/boot-serial-test.c | 1 +
 2 files changed, 3 insertions(+)
tests/Makefile.include +2 -0
index 0b98dd7..6609276 100644
@@ -299,6 +299,8 @@ gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)
 
 check-qtest-alpha-y = tests/boot-serial-test$(EXESUF)
 
+check-qtest-hppa-y = tests/boot-serial-test$(EXESUF)
+
 check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
 
 check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF)
tests/boot-serial-test.c +1 -0
index 12bf6ec..ddaa78f 100644
@@ -67,6 +67,7 @@ typedef struct testdef {
 
 static testdef_t tests[] = {
     { "alpha", "clipper", "", "PCI:" },
+    { "hppa", "hppa", "", "Firmware Version" },
     { "ppc", "ppce500", "", "U-Boot" },
     { "ppc", "prep", "", "Open Hack'Ware BIOS" },
     { "ppc", "g3beige", "", "PowerPC,750" },
Signature · 1 line
1.8.3.1