From e67f389da1344fd538fcacbed176310f32be7f53 Mon Sep 17 00:00:00 2001
From: Norman Feske <norman.feske@genode-labs.com>
Date: Thu, 5 Mar 2020 17:02:09 +0100
Subject: [PATCH] Add fork test to depot autopilot

---
 repos/gems/run/depot_autopilot.run            |  1 +
 .../recipes/pkg/test-libc_fork/README         |  1 +
 .../recipes/pkg/test-libc_fork/archives       |  4 +++
 .../libports/recipes/pkg/test-libc_fork/hash  |  1 +
 .../pkg/test-libc_fork/runtime}               | 32 +++++++++++--------
 .../recipes/src/test-libc_fork/content.mk     |  3 ++
 .../libports/recipes/src/test-libc_fork/hash  |  1 +
 .../recipes/src/test-libc_fork/used_apis      |  3 ++
 repos/libports/src/test/fork/target.mk        |  1 +
 9 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 repos/libports/recipes/pkg/test-libc_fork/README
 create mode 100644 repos/libports/recipes/pkg/test-libc_fork/archives
 create mode 100644 repos/libports/recipes/pkg/test-libc_fork/hash
 rename repos/libports/{run/fork.run => recipes/pkg/test-libc_fork/runtime} (54%)
 create mode 100644 repos/libports/recipes/src/test-libc_fork/content.mk
 create mode 100644 repos/libports/recipes/src/test-libc_fork/hash
 create mode 100644 repos/libports/recipes/src/test-libc_fork/used_apis

diff --git a/repos/gems/run/depot_autopilot.run b/repos/gems/run/depot_autopilot.run
index 65f04e714..eebb51b55 100644
--- a/repos/gems/run/depot_autopilot.run
+++ b/repos/gems/run/depot_autopilot.run
@@ -676,6 +676,7 @@ set default_test_pkgs {
 	test-libc_connect_vfs_server_lxip
 	test-libc_counter
 	test-libc_execve
+	test-libc_fork
 	test-libc_getenv
 	test-libc_pipe
 	test-libc_vfs
diff --git a/repos/libports/recipes/pkg/test-libc_fork/README b/repos/libports/recipes/pkg/test-libc_fork/README
new file mode 100644
index 000000000..87fdcaed0
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-libc_fork/README
@@ -0,0 +1 @@
+Test for the fork mechanism provided by the libc.
diff --git a/repos/libports/recipes/pkg/test-libc_fork/archives b/repos/libports/recipes/pkg/test-libc_fork/archives
new file mode 100644
index 000000000..119aa130b
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-libc_fork/archives
@@ -0,0 +1,4 @@
+_/src/test-libc_fork
+_/src/libc
+_/src/vfs
+_/src/posix
diff --git a/repos/libports/recipes/pkg/test-libc_fork/hash b/repos/libports/recipes/pkg/test-libc_fork/hash
new file mode 100644
index 000000000..2a46fe685
--- /dev/null
+++ b/repos/libports/recipes/pkg/test-libc_fork/hash
@@ -0,0 +1 @@
+2020-03-05 b27355bcca5734849df65900d0c9787f26d128de
diff --git a/repos/libports/run/fork.run b/repos/libports/recipes/pkg/test-libc_fork/runtime
similarity index 54%
rename from repos/libports/run/fork.run
rename to repos/libports/recipes/pkg/test-libc_fork/runtime
index 03dc7c27f..daaac5abc 100644
--- a/repos/libports/run/fork.run
+++ b/repos/libports/recipes/pkg/test-libc_fork/runtime
@@ -1,8 +1,22 @@
-build { core init test/fork }
+<runtime ram="32M" caps="1000" binary="init">
 
-create_boot_directory
+	<requires> <timer/> </requires>
+
+	<events>
+		<timeout meaning="failed" sec="30" />
+		<log meaning="succeeded">--- parent done ---*child*exited*</log>
+	</events>
+
+	<content>
+		<rom label="ld.lib.so"/>
+		<rom label="libc.lib.so"/>
+		<rom label="libm.lib.so"/>
+		<rom label="posix.lib.so"/>
+		<rom label="vfs.lib.so"/>
+		<rom label="vfs"/>
+		<rom label="test-fork"/>
+	</content>
 
-install_config {
 	<config verbose="yes">
 		<parent-provides>
 			<service name="ROM"/>
@@ -10,7 +24,7 @@ install_config {
 			<service name="CPU"/>
 			<service name="PD"/>
 		</parent-provides>
-		<start name="test-fork" caps="300">
+		<start name="test-fork" caps="500">
 			<resource name="RAM" quantum="1G"/>
 			<config>
 				<arg value="name_of_executeable"/>
@@ -25,13 +39,5 @@ install_config {
 			<route> <any-service> <parent/> </any-service> </route>
 		</start>
 	</config>
-}
 
-build_boot_image {
-	core init ld.lib.so libc.lib.so vfs.lib.so libm.lib.so posix.lib.so test-fork
-}
-
-append qemu_args " -nographic "
-
-run_genode_until "--- parent done ---.*\n" 20
-run_genode_until "child.*exited.*\n" 5 [output_spawn_id]
+</runtime>
diff --git a/repos/libports/recipes/src/test-libc_fork/content.mk b/repos/libports/recipes/src/test-libc_fork/content.mk
new file mode 100644
index 000000000..bcd8a7629
--- /dev/null
+++ b/repos/libports/recipes/src/test-libc_fork/content.mk
@@ -0,0 +1,3 @@
+SRC_DIR = src/test/fork
+
+include $(GENODE_DIR)/repos/base/recipes/src/content.inc
diff --git a/repos/libports/recipes/src/test-libc_fork/hash b/repos/libports/recipes/src/test-libc_fork/hash
new file mode 100644
index 000000000..a851b272e
--- /dev/null
+++ b/repos/libports/recipes/src/test-libc_fork/hash
@@ -0,0 +1 @@
+2020-03-05 22e92d890bfb543101288b1da11c2ba76beb01ed
diff --git a/repos/libports/recipes/src/test-libc_fork/used_apis b/repos/libports/recipes/src/test-libc_fork/used_apis
new file mode 100644
index 000000000..ce85f15de
--- /dev/null
+++ b/repos/libports/recipes/src/test-libc_fork/used_apis
@@ -0,0 +1,3 @@
+base
+posix
+libc
diff --git a/repos/libports/src/test/fork/target.mk b/repos/libports/src/test/fork/target.mk
index cb2bda101..9a30938b6 100644
--- a/repos/libports/src/test/fork/target.mk
+++ b/repos/libports/src/test/fork/target.mk
@@ -3,3 +3,4 @@ SRC_CC = test.cc
 LIBS   = posix
 
 CC_CXX_WARN_STRICT =
+CC_CXX_OPT += -fno-exceptions