From 9203b83f244fb6ca2a179e87e42a7ce5c3bb97bf Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Fri, 4 Sep 2015 12:38:38 +0200 Subject: [PATCH] nic: modify network_test to be executed with qemu Ref #1667 --- repos/libports/run/network_test.inc | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/repos/libports/run/network_test.inc b/repos/libports/run/network_test.inc index 4f2613d93..c7ef6e0bf 100644 --- a/repos/libports/run/network_test.inc +++ b/repos/libports/run/network_test.inc @@ -172,12 +172,20 @@ lappend_if [have_spec arndale] boot_modules platform_drv build_boot_image $boot_modules +append qemu_args " -net user,hostfwd=tcp::10000-:10000 " +append qemu_args " -nographic -serial mon:stdio " + # get IP address from server set match_string "got IP address (.*)\033.*\n" run_genode_until $match_string 30 -set server_spawn_id $spawn_id +if {[have_include power_on/qemu]} { + set server_spawn_id $output_spawn_id + set ip_addr "127.0.0.1" +} else { + set server_spawn_id $spawn_id + regexp $match_string $output all ip_addr +} -regexp $match_string $output all ip_addr puts "got server IP address: $ip_addr" set match_string "wait....*\n" @@ -235,6 +243,7 @@ if {[expr [have_spec omap4] || [have_spec arndale]]} { send -i $server_spawn_id "\x01\x18" ;# Ctrl-A Ctrl-X } +set qemu_args "" exec rm -f bin/network_test_client # vi: set ft=tcl :