ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-02 09:18:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

netperf: adapt to link-state change changes

Browse Source 
Change the matching mechanism because the IP address message may appear
at any time after starting the netserver when using lwip.

Issue #1327.
This commit is contained in:
Josef Söntgen 2015-03-16 11:18:36 +01:00 committed by Christian Helmuth
parent 2d469cb35c
commit c6f33fc0d2
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
repos/ports/run/netperf.inc
View File

@ -324,7 +324,12 @@ append_if [have_spec lan9118] qemu_args " -net nic,model=lan9118 "
append qemu_args " -net user -redir tcp:12865::12865 -redir tcp:49153::49153 "
run_genode_until {.*and family AF_INET.*} 30
if {[have_spec linux]} {
run_genode_until {.*family AF_INET.*\n} 60
} else {
run_genode_until $ip_match_string 60
}
set serial_id [output_spawn_id]
set force_ports ""
@ -338,6 +343,9 @@ if {[have_include "power_on/qemu"]} {
puts ""
}
# give the TCP/IP stack some time to settle down
sleep 3
# start netperf client connecting to netperf server running native on Genode
foreach netperf_test $netperf_tests {
puts "\n---------------------------- $netperf_test -----------------------"

2
repos/ports/run/netperf_lwip.inc
View File

@ -1,4 +1,4 @@
set netperf_target app/netperf/lwip
set netperf_app netserver_lwip
set netperf_stack lwip.lib.so
set ip_match_string "got IP address (\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+)"
set ip_match_string "got IP address (\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}.\[0-9]{1,3}).*\n"

2
repos/ports/run/netperf_lxip.inc
View File

@ -1,4 +1,4 @@
set netperf_target app/netperf/lxip
set netperf_app netserver_lxip
set netperf_stack { lxip.lib.so libc_resolv.lib.so }
set ip_match_string "ipaddr=(\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+)"
set ip_match_string "ipaddr=(\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+).*\n"