From 01daf1994745a25f2184bdc4cb16defd1092921e Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Wed, 1 Feb 2017 21:06:34 +0100
Subject: [PATCH] Extend libc counter tests

---
 repos/libports/run/libc_counter.run           |  6 +-
 repos/libports/run/libc_select.run            |  4 +-
 repos/libports/run/libc_vfs_counter.run       | 96 +++++++++++++++++++
 repos/libports/run/libc_vfs_select.run        | 91 ++++++++++++++++++
 .../src/test/libc_counter/source/main.cc      |  3 +
 5 files changed, 195 insertions(+), 5 deletions(-)
 create mode 100644 repos/libports/run/libc_vfs_counter.run
 create mode 100644 repos/libports/run/libc_vfs_select.run

diff --git a/repos/libports/run/libc_counter.run b/repos/libports/run/libc_counter.run
index 13dbf63472..15658184f3 100644
--- a/repos/libports/run/libc_counter.run
+++ b/repos/libports/run/libc_counter.run
@@ -39,7 +39,7 @@ append config {
 
 	<start name="test-libc_counter-source">
 		<resource name="RAM" quantum="8M"/>
-		<config ld_verbose="yes">
+		<config>
 			<vfs>
 				<dir name="dev"> <terminal/> <log/> </dir>
 			</vfs>
@@ -48,7 +48,7 @@ append config {
 	</start>
 	<start name="test-libc_counter-sink">
 		<resource name="RAM" quantum="8M"/>
-		<config ld_verbose="yes">
+		<config>
 			<vfs>
 				<dir name="dev"> <terminal/> <log/> <null/> </dir>
 			</vfs>
@@ -79,6 +79,6 @@ append qemu_args "-nographic -m 64"
 # Execute test case
 #
 
-run_genode_until forever
+run_genode_until "child \"test-libc_counter-sink\" exited with exit value 0.*\n" 30
 
 # vi: set ft=tcl :
diff --git a/repos/libports/run/libc_select.run b/repos/libports/run/libc_select.run
index e888b78ef7..3c26f0aefb 100644
--- a/repos/libports/run/libc_select.run
+++ b/repos/libports/run/libc_select.run
@@ -36,7 +36,7 @@ set config {
 
 	<start name="test-libc_counter-source">
 		<resource name="RAM" quantum="8M"/>
-		<config ld_verbose="yes">
+		<config>
 			<vfs>
 				<dir name="dev"> <terminal/> <log/> </dir>
 			</vfs>
@@ -77,6 +77,6 @@ build_boot_image $boot_modules
 
 append qemu_args " -m 128 -nographic "
 
-run_genode_until ".*child.*test-libc_select.*exited with exit value 0.*\n" 120
+run_genode_until "child \"test-libc_select\" exited with exit value 0.*\n" 120
 
 # vi: set ft=tcl :
diff --git a/repos/libports/run/libc_vfs_counter.run b/repos/libports/run/libc_vfs_counter.run
new file mode 100644
index 0000000000..125f4166bf
--- /dev/null
+++ b/repos/libports/run/libc_vfs_counter.run
@@ -0,0 +1,96 @@
+#
+# Build
+#
+
+set build_components {
+	core init drivers/timer server/terminal_crosslink server/vfs
+	test/libc_counter
+}
+
+build $build_components
+
+create_boot_directory
+
+#
+# Generate config
+#
+
+append config {
+<config>
+	<parent-provides>
+		<service name="ROM"/>
+		<service name="RAM"/>
+		<service name="PD"/>
+		<service name="RM"/>
+		<service name="CPU"/>
+		<service name="LOG"/>
+	</parent-provides>
+	<default-route>
+		<any-service> <parent/> <any-child/> </any-service>
+	</default-route>
+
+	<start name="timer">
+		<resource name="RAM" quantum="1M"/>
+		<provides> <service name="Timer"/> </provides>
+	</start>
+	<start name="terminal_crosslink">
+		<resource name="RAM" quantum="1M"/>
+		<provides> <service name="Terminal"/> </provides>
+	</start>
+	<start name="vfs">
+		<resource name="RAM" quantum="12M"/>
+		<provides> <service name="File_system"/> </provides>
+		<config>
+			<vfs>
+				<terminal/>
+			</vfs>
+			<default-policy root="/" writeable="yes"/>
+		</config>
+	</start>
+
+	<start name="test-libc_counter-source">
+		<resource name="RAM" quantum="8M"/>
+		<config>
+			<vfs>
+				<dir name="dev"> <terminal/> <log/> </dir>
+			</vfs>
+			<libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/>
+		</config>
+	</start>
+	<start name="test-libc_counter-sink">
+		<resource name="RAM" quantum="8M"/>
+		<config>
+			<vfs>
+				<dir name="dev"> <log/> <null/> </dir>
+				<dir name="vfs"> <fs/> </dir>
+			</vfs>
+			<libc stdin="/vfs/terminal" stdout="/vfs/terminal" stderr="/dev/log"/>
+		</config>
+	</start>
+</config>
+}
+
+install_config $config
+
+#
+# Boot modules
+#
+
+
+set boot_modules {
+	core init timer terminal_crosslink vfs
+	test-libc_counter-source test-libc_counter-sink
+	ld.lib.so libc.lib.so libm.lib.so
+}
+
+build_boot_image $boot_modules
+
+append qemu_args "-nographic -m 64"
+
+#
+# Execute test case
+#
+
+run_genode_until "child \"test-libc_counter-sink\" exited with exit value 0.*\n" 30
+
+# vi: set ft=tcl :
diff --git a/repos/libports/run/libc_vfs_select.run b/repos/libports/run/libc_vfs_select.run
new file mode 100644
index 0000000000..a30d6ad316
--- /dev/null
+++ b/repos/libports/run/libc_vfs_select.run
@@ -0,0 +1,91 @@
+set build_components {
+	core init drivers/timer server/terminal_crosslink server/vfs
+	test/libc_select test/libc_counter
+}
+
+build $build_components
+
+create_boot_directory
+
+set config {
+<config>
+	<parent-provides>
+		<service name="ROM"/>
+		<service name="RAM"/>
+		<service name="IRQ"/>
+		<service name="IO_MEM"/>
+		<service name="IO_PORT"/>
+		<service name="CAP"/>
+		<service name="PD"/>
+		<service name="RM"/>
+		<service name="CPU"/>
+		<service name="LOG"/>
+	</parent-provides>
+	<default-route>
+		<any-service> <parent/> <any-child/> </any-service>
+	</default-route>
+
+	<start name="timer">
+		<resource name="RAM" quantum="2M"/>
+		<provides> <service name="Timer"/> </provides>
+	</start>
+	<start name="terminal_crosslink">
+		<resource name="RAM" quantum="1M"/>
+		<provides> <service name="Terminal"/> </provides>
+	</start>
+	<start name="vfs">
+		<resource name="RAM" quantum="12M"/>
+		<provides> <service name="File_system"/> </provides>
+		<config>
+			<vfs>
+				<terminal/>
+			</vfs>
+			<default-policy root="/" writeable="yes"/>
+		</config>
+	</start>
+
+	<start name="test-libc_counter-source">
+		<resource name="RAM" quantum="8M"/>
+		<config>
+			<vfs>
+				<dir name="dev"> <terminal/> <log/> </dir>
+			</vfs>
+			<libc stdin="/dev/terminal" stdout="/dev/terminal" stderr="/dev/log"/>
+		</config>
+	</start>
+	<start name="test-libc_select">
+		<resource name="RAM" quantum="4M"/>
+		<config>
+			<arg value="test-libc_select"/>
+			<arg value="/dev/log"/>
+			<arg value="/vfs/terminal"/>
+			<!--
+			<arg value=":"/>
+			<arg value="/dev/log"/>
+			-->
+			<vfs>
+				<dir name="dev"> <log/> <null/> <zero/> </dir>
+				<dir name="vfs"> <fs/> </dir>
+			</vfs>
+			<libc stdin="/dev/null" stdout="/dev/log" stderr="/dev/log"/>
+		</config>
+	</start>
+</config>
+}
+
+install_config $config
+
+set boot_modules {
+	core init timer terminal_crosslink vfs
+	test-libc_counter-source test-libc_select
+	ld.lib.so libc.lib.so libm.lib.so stdcxx.lib.so pthread.lib.so
+	libc_pipe.lib.so
+}
+
+build_boot_image $boot_modules
+
+append qemu_args " -m 128 -nographic "
+
+run_genode_until "child \"test-libc_select\" exited with exit value 0.*\n" 120
+
+# vi: set ft=tcl :
diff --git a/repos/libports/src/test/libc_counter/source/main.cc b/repos/libports/src/test/libc_counter/source/main.cc
index f2f2a56db3..339d2c3908 100644
--- a/repos/libports/src/test/libc_counter/source/main.cc
+++ b/repos/libports/src/test/libc_counter/source/main.cc
@@ -24,6 +24,9 @@ int main(int argc, char **argv)
 {
 	fprintf(stderr, "--- counter source started ---\n");
 
+	/* idle some time, so the sink has a chance to block ;-) */
+	sleep(2);
+
 	static char buf[32];
 
 	/* stdin/stdout are connected to the source */