From 95f3e6fd4d768b202c084806f293a99727479550 Mon Sep 17 00:00:00 2001
From: Johannes Schlatow <schlatow@ida.ing.tu-bs.de>
Date: Thu, 2 Mar 2017 12:47:21 +0100
Subject: [PATCH] remote_rom: fix session routing

---
 run/remote_rom_backend_nic_ip.run        | 16 +++-------------
 run/remote_rom_backend_nic_ip_client.run |  2 +-
 run/remote_rom_backend_nic_ip_server.run |  2 +-
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/run/remote_rom_backend_nic_ip.run b/run/remote_rom_backend_nic_ip.run
index d9e2a99..91c54ea 100644
--- a/run/remote_rom_backend_nic_ip.run
+++ b/run/remote_rom_backend_nic_ip.run
@@ -58,7 +58,7 @@ install_config {
 	<start name="remote_rom_server">
 		<resource name="RAM" quantum="8M"/>
 		<route>
-			<service name="ROM"> <child name="dynamic_rom"/> </service>
+			<service name="ROM" label_suffix="test"> <child name="dynamic_rom"/> </service>
 			<service name="Nic"> <child name="nic_bridge"/> </service>
 			<any-service> <parent/> </any-service>
 		</route>
@@ -107,7 +107,7 @@ install_config {
 		<resource name="RAM" quantum="4M"/>
 		<config rom="remote" />
 		<route>
-			<service name="ROM"> <child name="remote_rom_client"/> </service>
+			<service name="ROM" label_suffix="remote"> <child name="remote_rom_client"/> </service>
 			<any-service> <parent/> </any-service>
 		</route>
 	</start>
@@ -130,18 +130,8 @@ append qemu_args " -nographic "
 
 run_genode_until {.*change \(finished\).*} 30
 
-grep_output {init -> rom_logger}
+grep_output {<test enabled}
 compare_output_to {
-[init -> rom_logger] ROM 'remote':
-[init -> rom_logger]   <default />
-[init -> rom_logger]   
-[init -> rom_logger] ROM 'remote':
-[init -> rom_logger]   <default />
-[init -> rom_logger]
-[init -> rom_logger] ROM 'remote':
 [init -> rom_logger]   <test enabled="no"/>
-[init -> rom_logger]  
-[init -> rom_logger] ROM 'remote':
 [init -> rom_logger]   <test enabled="yes"/>
-[init -> rom_logger]
 }
diff --git a/run/remote_rom_backend_nic_ip_client.run b/run/remote_rom_backend_nic_ip_client.run
index 72b7ec9..d297029 100644
--- a/run/remote_rom_backend_nic_ip_client.run
+++ b/run/remote_rom_backend_nic_ip_client.run
@@ -39,7 +39,7 @@ install_config {
 		<resource name="RAM" quantum="4M"/>
 		<config rom="remote" />
 		<route>
-			<service name="ROM"> <child name="remote_rom_client"/> </service>
+			<service name="ROM" label_suffix="remote"> <child name="remote_rom_client"/> </service>
 			<any-service> <parent/> </any-service>
 		</route>
 	</start>
diff --git a/run/remote_rom_backend_nic_ip_server.run b/run/remote_rom_backend_nic_ip_server.run
index 27f45b7..85aeaf7 100644
--- a/run/remote_rom_backend_nic_ip_server.run
+++ b/run/remote_rom_backend_nic_ip_server.run
@@ -56,7 +56,7 @@ install_config {
 	<start name="remote_rom_server">
 		<resource name="RAM" quantum="8M"/>
 		<route>
-			<service name="ROM"> <child name="dynamic_rom"/> </service>
+			<service name="ROM" label_suffix="test"> <child name="dynamic_rom"/> </service>
 			<service name="Nic"> <child name="nic_drv"/> </service>
 			<any-service> <parent/> </any-service>
 		</route>