From ed33cf08c796b1318b7d9b8377850b4a8b888e5d Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 21 Mar 2019 09:54:42 +0100
Subject: [PATCH] test-fs_tool: make output deterministic

Issue #3238
---
 repos/gems/recipes/pkg/test-fs_tool/runtime | 41 +++++++++------------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/repos/gems/recipes/pkg/test-fs_tool/runtime b/repos/gems/recipes/pkg/test-fs_tool/runtime
index 0251fc5575..8a96bccf9e 100644
--- a/repos/gems/recipes/pkg/test-fs_tool/runtime
+++ b/repos/gems/recipes/pkg/test-fs_tool/runtime
@@ -1,25 +1,18 @@
 <runtime ram="32M" caps="1000" binary="init">
 
 	<events>
-		<timeout meaning="failed" sec="10" />
+		<timeout meaning="failed" sec="20" />
 		<log meaning="succeeded">
-			[init -> report_rom] report 'fs_query -> listing'*
-			[init -> report_rom]   &lt;listing>*
-			[init -> report_rom]   	&lt;dir path="/fs/items">*
-			[init -> report_rom]   		&lt;file name="1">first&lt;/file>*
-			[init -> report_rom]   		&lt;file name="2">second&lt;/file>*
-			[init -> report_rom]   	&lt;/dir>*
-			[init -> report_rom]   &lt;/listing>*
-			[init -> test -> remove] Warning: file/items cannot be removed because it is a directory*
+			[init -> test -> remove] *file/items cannot be removed because it is a directory*
 			[init -> test -> remove] remove file /items/2*
-			[init -> test -> remove] Warning: file/3 cannot be removed because there is no such file*
+			[init -> test -> remove] *file/3 cannot be removed because there is no such file*
 			[init -> test -> remove] remove file /4*
-			[init -> report_rom] report 'fs_query -> listing'*
-			[init -> report_rom]   &lt;listing>*
-			[init -> report_rom]   	&lt;dir path="/fs/items">*
-			[init -> report_rom]   		&lt;file name="1">first&lt;/file>*
-			[init -> report_rom]   	&lt;/dir>*
-			[init -> report_rom]   &lt;/listing>*
+			[init -> report_rom] report 'test -> fs_query -> listing'
+			[init -> report_rom]   &lt;listing>
+			[init -> report_rom]   	&lt;dir path="/fs/items">
+			[init -> report_rom]   		&lt;file name="1">first&lt;/file>
+			[init -> report_rom]   	&lt;/dir>
+			[init -> report_rom]   &lt;/listing>
 		</log>
 	</events>
 
@@ -75,14 +68,6 @@
 			</config>
 		</start>
 
-		<start name="fs_query">
-			<resource name="RAM" quantum="1M"/>
-			<config>
-				<vfs> <dir name="fs"> <fs writeable="yes"/> </dir> </vfs>
-				<query path="/fs/items" content="yes"/>
-			</config>
-		</start>
-
 		<start name="test" caps="700">
 			<binary name="sequence"/>
 			<resource name="RAM" quantum="16M"/>
@@ -109,6 +94,14 @@
 					</config>
 				</start>
 
+				<start name="fs_query">
+					<resource name="RAM" quantum="1M"/>
+					<config>
+						<vfs> <dir name="fs"> <fs/> </dir> </vfs>
+						<query path="/fs/items" content="yes"/>
+					</config>
+				</start>
+
 				<start name="sleep" caps="100">
 					<resource name="RAM" quantum="4M"/>
 					<binary name="dummy"/>