The boot-serial test uses SeaBIOS on HPPA, and expects to read the
"SeaBIOS wants SYSTEM HALT" string, see [*]:
122 void __VISIBLE __noreturn hlt(void)
123 {
124 if (pdc_debug)
125 printf("HALT initiated from %p\n", __builtin_return_address(0));
126 printf("SeaBIOS wants SYSTEM HALT.\n\n");
127 asm volatile("\t.word 0xfffdead0": : :"memory");
128 while (1);
129 }
A 'SYSTEM HALT' would really halts the CPU, but SeaBIOS implements
it as an infinite loop.
If SeaBIOS does not use the expected serial port but another device,
we might poll the console indefinitely while the machine is halted.
Allow the HPPA machine to 'shutdown'. When it does, we'll get
a qtest error:
$ make check-qtest-hppa
TEST check-qtest-hppa: tests/qtest/boot-serial-test
** (tests/qtest/boot-serial-test:31924): ERROR **: 01:12:37.604: Failed to
find expected string. Please check '/tmp/qtest-boot-serial-sjxoM6Q'
ERROR - Bail out! FATAL-ERROR: Failed to find expected string. Please check
'/tmp/qtest-boot-serial-sjxoM6Q'
make: *** [tests/Makefile.include:628: check-qtest-hppa] Error 1
[*]
https://github.com/qemu/seabios-hppa/blob/1630ac7d65/src/parisc/parisc.c#L138
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
I first used:
shutdown = !strcmp(test->arch, "hppa");
Then remembered we'll have other HPPA machines soon.
Instead of:
shutdown = !strcmp(test->machine, "hppa");
I find the check on the SeaBIOS specific string more accurate
(since someone might add some assembly lines as the other tests).
---
tests/qtest/boot-serial-test.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c
index 05c7f44457..4e92f292f5 100644
--- a/tests/qtest/boot-serial-test.c
+++ b/tests/qtest/boot-serial-test.c
@@ -188,6 +188,17 @@ static void test_machine(const void *data)
const uint8_t *code = NULL;
QTestState *qts;
int ser_fd;
+ bool shutdown;
+
+ /*
+ * This test uses SeaBIOS on HPPA, and expects to read the
+ * "SeaBIOS wants SYSTEM HALT" string. A 'SYSTEM HALT' really
+ * halts the CPU. If SeaBIOS does not use the expected serial
+ * port but another device, we might poll the console
+ * indefinitely while the machine is halted.
+ * Keep using this option for all the other tests.
+ */
+ shutdown = !strcmp(test->expect, "SeaBIOS wants SYSTEM HALT");
ser_fd = mkstemp(serialtmp);
g_assert(ser_fd != -1);
@@ -215,10 +226,11 @@ static void test_machine(const void *data)
* Make sure that this test uses tcg if available: It is used as a
* fast-enough smoketest for that.
*/
- qts = qtest_initf("%s %s -M %s -no-shutdown "
+ qts = qtest_initf("%s %s -M %s %s "
"-chardev file,id=serial0,path=%s "
"-serial chardev:serial0 -accel tcg -accel kvm %s",
codeparam, code ? codetmp : "", test->machine,
+ shutdown ? "" : "-no-shutdown",
serialtmp, test->extra);
if (code) {
unlink(codetmp);
--
2.21.1
