From 30b47eab37bd79a9b2f3f5545aaa31f49a9c4758 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 19 Feb 2019 14:40:52 +0100 Subject: [PATCH] Fix IP address matching in vbox share tests --- repos/ports/run/vbox_share.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/repos/ports/run/vbox_share.inc b/repos/ports/run/vbox_share.inc index 9c8985aa7..8cd756c29 100644 --- a/repos/ports/run/vbox_share.inc +++ b/repos/ports/run/vbox_share.inc @@ -272,14 +272,15 @@ exec cp ${genode_dir}/repos/ports/run/$vbox_file bin/. build_boot_image $boot_modules +set ip_match_string "address=(\[0-9\]+\.\[0-9\]+\.\[0-9\]+\.\[0-9\]+).*\n" + # # Step 2: Read out TCP/IP address of tcp_terminal running on Genode target # -run_genode_until {\[init -> tcp_terminal\] got IP address [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} 20 +run_genode_until $ip_match_string 20 set serial_id [output_spawn_id] -regexp {\[init -> tcp_terminal\] got IP address [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $output serial_ip_addr -regexp {[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+} $serial_ip_addr serial_ip_addr +regexp $ip_match_string $output -> serial_ip_addr # # Step 3: Wait until Windows is up for sure