Skip to contentSkip to conversation

tests/prom-env: Ease time-out problems on slow hosts

PATCH Superseded Thomas Huth 3 participants 5 messages Feb 9, 2017 – Feb 10, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/prom-env: Ease time-out problems on slow hosts

Peter Maydell recently ran into time-out problems with the prom-env test on a rather slow ARM board. To tackle this issue, we can speed up the test by running QEMU with "-nodefaults" here, so that SLOF has less devices to scan during boot, and by using the "nvramrc" environment variable instead of "boot-command", since this variable is evaluated earlier in the boot process. And to be really sure that we do not face such time out problems again, let's also increase the time out value from 100s to 120s instead.

---
 tests/prom-env-test.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
tests/prom-env-test.c +5 -3
index 0ba6f48..7d97ae4 100644
@@ -30,8 +30,8 @@ static void check_guest_memory(void)
     uint32_t signature;
     int i;
 
-    /* Poll until code has run and modified memory. Wait at most 30 seconds */
-    for (i = 0; i < 10000; ++i) {
+    /* Poll until code has run and modified memory. Wait at most 120 seconds */
+    for (i = 0; i < 12000; ++i) {
         signature = readl(ADDRESS);
         if (signature == MAGIC) {
             break;
@@ -46,7 +46,9 @@ static void test_machine(const void *machine)
 {
     char *args;
 
-    args = g_strdup_printf("-M %s,accel=tcg -prom-env 'boot-command=%x %x l!'",
+    args = g_strdup_printf("-M %s,accel=tcg -nodefaults "
+                           "-prom-env 'use-nvramrc?=true' "
+                           "-prom-env 'nvramrc=%x %x l!'",
                            (const char *)machine, MAGIC, ADDRESS);
 
     qtest_start(args);
Signature · 1 line
1.8.3.1
Tested-by on v1 1/1
#1 lore raw
Quoted 10 lines · Thomas Huth

Peter Maydell recently ran into time-out problems with the prom-env test on a rather slow ARM board. To tackle this issue, we can speed up the test by running QEMU with "-nodefaults" here, so that SLOF has less devices to scan during boot, and by using the "nvramrc" environment variable instead of "boot-command", since this variable is evaluated earlier in the boot process. And to be really sure that we do not face such time out problems again, let's also increase the time out value from 100s to 120s instead.

Quoted 4 lines
---
 tests/prom-env-test.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Seems to cut the elapsed realtime for the pseries board down from about 90s to 55s. Hopefully that plus the boosted timeout will help.

thanks
-- PMM

#2 lore raw
Quoted 16 lines · Peter Maydell
Quoted 10 lines · Thomas Huth

Peter Maydell recently ran into time-out problems with the prom-env test on a rather slow ARM board. To tackle this issue, we can speed up the test by running QEMU with "-nodefaults" here, so that SLOF has less devices to scan during boot, and by using the "nvramrc" environment variable instead of "boot-command", since this variable is evaluated earlier in the boot process. And to be really sure that we do not face such time out problems again, let's also increase the time out value from 100s to 120s instead.

Quoted 4 lines
---
 tests/prom-env-test.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
Quoted 5 lines

Seems to cut the elapsed realtime for the pseries board down from about 90s to 55s. Hopefully that plus the boosted timeout will help.

Peter, will you merge this directly, or do you want me to take it through my tree?

Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
#3 lore raw
Quoted 17 lines · David Gibson
Quoted 16 lines · Peter Maydell
Quoted 14 lines · Thomas Huth

Peter Maydell recently ran into time-out problems with the prom-env test on a rather slow ARM board. To tackle this issue, we can speed up the test by running QEMU with "-nodefaults" here, so that SLOF has less devices to scan during boot, and by using the "nvramrc" environment variable instead of "boot-command", since this variable is evaluated earlier in the boot process. And to be really sure that we do not face such time out problems again, let's also increase the time out value from 100s to 120s instead.

---
 tests/prom-env-test.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
Quoted 8 lines
Quoted 5 lines

Seems to cut the elapsed realtime for the pseries board down from about 90s to 55s. Hopefully that plus the boosted timeout will help.

Peter, will you merge this directly, or do you want me to take it through my tree?

I just did a full test with the intention of merging it into master, and I noticed it causes new warnings on the sparc prom tests:

TEST: tests/prom-env-test... (pid=17171)
/sparc/prom-env/SPARCbook:
Warning: nic
lance.0 has no peer
OK
/sparc/prom-env/Voyager:
Warning: nic
lance.0 has no peer
OK
/sparc/prom-env/SS-20:
Warning: nic
lance.0 has no peer
OK
PASS: tests/prom-env-test

So it needs some tweaking, I think.

thanks
-- PMM

#4 lore raw
Quoted 46 lines · Peter Maydell
Quoted 17 lines · David Gibson
Quoted 16 lines · Peter Maydell
Quoted 14 lines · Thomas Huth

Peter Maydell recently ran into time-out problems with the prom-env test on a rather slow ARM board. To tackle this issue, we can speed up the test by running QEMU with "-nodefaults" here, so that SLOF has less devices to scan during boot, and by using the "nvramrc" environment variable instead of "boot-command", since this variable is evaluated earlier in the boot process. And to be really sure that we do not face such time out problems again, let's also increase the time out value from 100s to 120s instead.

---
 tests/prom-env-test.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
Quoted 8 lines
Quoted 5 lines

Seems to cut the elapsed realtime for the pseries board down from about 90s to 55s. Hopefully that plus the boosted timeout will help.

Peter, will you merge this directly, or do you want me to take it through my tree?

I just did a full test with the intention of merging it into master, and I noticed it causes new warnings on the sparc prom tests:

TEST: tests/prom-env-test... (pid=17171)
/sparc/prom-env/SPARCbook:
Warning: nic
lance.0 has no peer
OK
/sparc/prom-env/Voyager:
Warning: nic
lance.0 has no peer
OK
/sparc/prom-env/SS-20:
Warning: nic
lance.0 has no peer
OK
PASS: tests/prom-env-test

Quoted 1 line

So it needs some tweaking, I think.

D'oh, sorry, I should have checked that ... it's likely of the new "-nodefaults" flag ... I'll have a look.

Thomas