From 7f965dad29bcfc87cd8e5a773cd8fd3516462ab3 Mon Sep 17 00:00:00 2001
From: Stefan Kalkowski <stefan.kalkowski@genode-labs.com>
Date: Thu, 4 Apr 2019 16:41:41 +0200
Subject: [PATCH] vmm_arm: do not use uart driver in automated test

Fix #3278
---
 repos/os/run/vmm_arm.run | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/repos/os/run/vmm_arm.run b/repos/os/run/vmm_arm.run
index 82a6d874cc..ad966de963 100644
--- a/repos/os/run/vmm_arm.run
+++ b/repos/os/run/vmm_arm.run
@@ -10,7 +10,8 @@ assert_spec arndale
 set build_components {
 	core init timer
 	drivers/platform
-	drivers/uart
+	server/terminal_crosslink
+	test/terminal_expect_send
 	server/vmm
 }
 build $build_components
@@ -41,19 +42,18 @@ install_config {
 		<resource name="RAM" quantum="1M"/>
 		<provides><service name="Timer"/></provides>
 	</start>
-	<start name="uart_drv">
-		<resource name="RAM" quantum="2M"/>
-		<provides>
-			<service name="Terminal"/>
-			<service name="Uart"/>
-		</provides>
-		<config>
-			<policy label_prefix="vmm" uart="1"/>
-		</config>
+	<start name="terminal_crosslink">
+		<resource name="RAM" quantum="1M"/>
+		<provides> <service name="Terminal"/> </provides>
 	</start>
 	<start name="vmm">
 		<resource name="RAM" quantum="256M"/>
 	</start>
+	<start name="vm">
+		<binary name="test-terminal_expect_send"/>
+		<resource name="RAM" quantum="1M"/>
+		<config expect="/ #" send="ls" verbose="yes"/>
+	</start>
 </config>
 }
 
@@ -92,8 +92,9 @@ if {![file exists bin/dtb]} {
 set boot_modules {
 	core ld.lib.so init
 	platform_drv
-	uart_drv
 	timer
+	terminal_crosslink
+	test-terminal_expect_send
 	vmm
 	linux
 	dtb
@@ -103,8 +104,5 @@ build_boot_image $boot_modules
 #
 # Execute test case
 #
-run_genode_until {.*\/ #.*} 220
-set serial_id [output_spawn_id]
-send -i $serial_id "ls\n"
-run_genode_until "var" 30 $serial_id
+run_genode_until "\[init -> vm\] .*sbin.*" 220
 exec rm bin/linux bin/dtb