From 563f55e57bf646d3ae11be4bbc97c76810988c0b Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Tue, 13 Jun 2023 15:18:44 +0200 Subject: [PATCH] nic_dump.run: relax test procedure This test was originally a copy of ping.run and therefore unnecessarily inherited all its complexity for testing ping component behavior. Additionally, ping.run was more actively maintained and evolved over time whereas nic_dump.run didn't receive the same care. Now, the test fails on certain platforms although NIC dump works just fine. Therefore, this commit reduces the test behavior to what is really necessary for testing nic_dump and by doing so, also fixes the failing targets. Fixes #4926 --- repos/os/run/nic_dump.run | 189 +++----------------------------------- 1 file changed, 15 insertions(+), 174 deletions(-) diff --git a/repos/os/run/nic_dump.run b/repos/os/run/nic_dump.run index 2e0176610e..b3d02fc1a5 100644 --- a/repos/os/run/nic_dump.run +++ b/repos/os/run/nic_dump.run @@ -9,8 +9,6 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} { exit 0 } -set on_hardware [expr ![have_include power_on/qemu]] - create_boot_directory import_from_depot [depot_user]/src/[base_src] \ @@ -21,15 +19,13 @@ import_from_depot [depot_user]/src/[base_src] \ build { app/ping server/nic_dump } -proc good_dst_ip { } { +proc dst_ip { } { if {![have_include power_on/qemu]} { return "10.0.0.2" } else { return "10.0.2.2" } } -proc bad_dst_port { } { return "12345" } -proc bad_dst_ip { } { return "10.0.1.2" } append config { @@ -63,14 +59,13 @@ append config { - + - - + @@ -90,10 +85,7 @@ append config { - - - - + @@ -115,169 +107,26 @@ append config { icmp="all" tcp="default" /> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - } - -append_if $on_hardware config { - - - - - - - - - - } - -append config { - - } + +} install_config $config @@ -286,12 +135,4 @@ build_boot_image [build_artifacts] append qemu_args " -nographic " append_qemu_nic_args -set done_string "" -for {set i 0} {$i < 3} {incr i 1} { - append done_string ".*child \"ping...\" exited with exit value 0.*\n" -} -append done_string ".*ping_22\] From 10.0.4.1 icmp_seq=.* Destination Unreachable.*\n" - -append_if $on_hardware done_string ".*ping_23\] From [good_dst_ip] Destination Unreachable.*\n" - -run_genode_until $done_string 30 +run_genode_until ".*child \"ping\" exited with exit value 0.*\n" 60