From 40338f9acbe4a621286de0291acc1b15e1a449ec Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Wed, 14 Jun 2023 11:57:49 +0200 Subject: [PATCH] ping*.run: raise test timeout On some platforms (x86_32/pistachio, x86_64/sel4) system startup is slow and the previously configured 30 seconds not sufficient. With this commit, the timeout is raised to 60 seconds only when running on such a platform. Ref #4923 --- repos/os/run/ping.run | 7 ++++++- repos/os/run/ping_nic_router.run | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/repos/os/run/ping.run b/repos/os/run/ping.run index 57bade3d18..6960021972 100644 --- a/repos/os/run/ping.run +++ b/repos/os/run/ping.run @@ -197,4 +197,9 @@ append_qemu_nic_args set done_string ".*\"ping_1\" exited with exit value 0.*\n" append_if $second_ping_via_udp done_string ".*ping_2\] From [dst_ip] Destination Unreachable.*\n" -run_genode_until $done_string 30 +proc test_timeout { } { + if {[have_spec sel4] && [have_board pc]} { return 60 } + return 30 +} + +run_genode_until $done_string [test_timeout] diff --git a/repos/os/run/ping_nic_router.run b/repos/os/run/ping_nic_router.run index 897935cf4e..28d421d552 100644 --- a/repos/os/run/ping_nic_router.run +++ b/repos/os/run/ping_nic_router.run @@ -239,4 +239,10 @@ append done_string ".*ping_22\] From 10.0.4.1 icmp_seq=.* Destination Unreachabl append_if $on_hardware done_string ".*ping_23\] From [good_dst_ip] Destination Unreachable.*\n" -run_genode_until $done_string 30 +proc test_timeout { } { + if {[have_spec sel4] && [have_board pc]} { return 60 } + if {[have_spec pistachio] && [have_board pc]} { return 60 } + return 30 +} + +run_genode_until $done_string [test_timeout]