From e3c3f9f44f4158bbcc9fb2afb6280e283f9494dc Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Fri, 28 Jun 2013 12:32:43 +0200 Subject: [PATCH] run: restrict ports solely for qemu case Sometimes the ports are not freed up quick enough by the host system after the first test finished. The port restriction is mainly required for qemu, so don't use it for bare metal hardware tests. --- ports/run/netperf.run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/run/netperf.run b/ports/run/netperf.run index 2a0fbbdb4..abb1e5125 100644 --- a/ports/run/netperf.run +++ b/ports/run/netperf.run @@ -204,9 +204,10 @@ append qemu_args " -net user -redir tcp:12865::12865 -redir tcp:49153::49153 " run_genode_until {.*and family AF_INET.*} 30 set serial_id $spawn_id - +set force_ports "" if [is_qemu_available] { set ip_addr "localhost" + set force_ports "-P 49153,49153" } else { set match_string "got IP address (\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+)" regexp $match_string $output all ip_addr @@ -217,7 +218,7 @@ if [is_qemu_available] { foreach netperf_test $netperf_tests { puts "\n---------------------------- $netperf_test -----------------------" - spawn bin/netperf_host -H $ip_addr -P 1 -v 2 -t $netperf_test -c -C -- -m $packet_size -P 49153,49153 + spawn bin/netperf_host -H $ip_addr -P 1 -v 2 -t $netperf_test -c -C -- -m $packet_size $force_ports set netperf_id $spawn_id run_genode_until "Segment" 60 $netperf_id