diff --git a/repos/base/run/ada.run b/repos/base/run/ada.run
index 59dd3eda34..5b36fba80e 100644
--- a/repos/base/run/ada.run
+++ b/repos/base/run/ada.run
@@ -24,7 +24,7 @@ build_boot_image "core ld.lib.so init test-ada"
append qemu_args "-nographic "
-run_genode_until {child "test-ada" exited with exit value 0.*} 10
+run_genode_until {child "test-ada" exited with exit value 0.*} 20
grep_output {init -> test-ada}
unify_output {0x[0-9a-f]+} "UNIFIED"
diff --git a/repos/base/run/ds_ownership.run b/repos/base/run/ds_ownership.run
index 36e2ca7b6d..cff640d1bf 100644
--- a/repos/base/run/ds_ownership.run
+++ b/repos/base/run/ds_ownership.run
@@ -31,5 +31,5 @@ build_boot_image "core ld.lib.so init test-ds_ownership"
append qemu_args "-nographic "
-run_genode_until {.*test succeeded.*\n} 10
+run_genode_until {.*test succeeded.*\n} 20
diff --git a/repos/base/run/log.run b/repos/base/run/log.run
index e727ea4fb9..e246a8a5f5 100644
--- a/repos/base/run/log.run
+++ b/repos/base/run/log.run
@@ -24,7 +24,7 @@ build_boot_image "core ld.lib.so init test-log"
append qemu_args "-nographic "
-run_genode_until "Test done.*\n" 10
+run_genode_until "Test done.*\n" 20
grep_output {\[init -\> test-log\]}
diff --git a/repos/base/run/new_delete.run b/repos/base/run/new_delete.run
index b7d183424e..fce903b4b7 100644
--- a/repos/base/run/new_delete.run
+++ b/repos/base/run/new_delete.run
@@ -24,7 +24,7 @@ build_boot_image "core ld.lib.so init test-new_delete"
append qemu_args "-nographic "
-run_genode_until "Test done.*\n" 15
+run_genode_until "Test done.*\n" 20
grep_output {^\[init -> test-new_delete\]}
@@ -80,5 +80,3 @@ compare_output_to {
[init -> test-new_delete] Allocator::free()
[init -> test-new_delete] exception caught
}
-
-#puts "Test succeeded"
diff --git a/repos/base/run/reconstructible.run b/repos/base/run/reconstructible.run
index 4b73c80df2..8dd2ba3901 100644
--- a/repos/base/run/reconstructible.run
+++ b/repos/base/run/reconstructible.run
@@ -25,7 +25,7 @@ build_boot_image "core ld.lib.so init test-reconstructible"
append qemu_args "-nographic "
-run_genode_until {.*--- Reconstructible utility test finished ---.*\n} 10
+run_genode_until {.*--- Reconstructible utility test finished ---.*\n} 20
grep_output {-> test-reconstructible}
diff --git a/repos/base/run/sub_rm.run b/repos/base/run/sub_rm.run
index c7573a446b..0f96b7a6ea 100644
--- a/repos/base/run/sub_rm.run
+++ b/repos/base/run/sub_rm.run
@@ -32,7 +32,7 @@ build_boot_image "core ld.lib.so init test-sub_rm"
append qemu_args "-nographic "
-run_genode_until {.*--- end of sub-rm test ---.*} 10
+run_genode_until {.*--- end of sub-rm test ---.*} 20
if {([have_spec linux] && [have_spec x86_32])} {
set maps [exec cat /proc/[exec pidof test-sub_rm]/maps]
diff --git a/repos/base/run/synced_interface.run b/repos/base/run/synced_interface.run
index bc42e93dfa..4d6ae432fd 100644
--- a/repos/base/run/synced_interface.run
+++ b/repos/base/run/synced_interface.run
@@ -25,7 +25,7 @@ build_boot_image "core ld.lib.so init test-synced_interface"
append qemu_args "-nographic "
-run_genode_until {.*--- Synced interface test finished ---.*\n} 10
+run_genode_until {.*--- Synced interface test finished ---.*\n} 20
grep_output {-> test-synced_interface}
diff --git a/repos/base/run/util_mmio.run b/repos/base/run/util_mmio.run
index 51d474a627..51d056845d 100644
--- a/repos/base/run/util_mmio.run
+++ b/repos/base/run/util_mmio.run
@@ -38,7 +38,7 @@ build_boot_image "core ld.lib.so init test-util_mmio"
append qemu_args "-nographic "
-run_genode_until "Test done.*\n" 10
+run_genode_until "Test done.*\n" 20
#
# Conclusion
diff --git a/repos/gems/run/cpu_sampler.run b/repos/gems/run/cpu_sampler.run
index 994eead6a6..996b7205f2 100644
--- a/repos/gems/run/cpu_sampler.run
+++ b/repos/gems/run/cpu_sampler.run
@@ -86,7 +86,7 @@ append qemu_args "-nographic "
set match_string "Test started. func: 0x(\[0-9a-f\]+).*\n"
-run_genode_until "$match_string" 10
+run_genode_until "$match_string" 20
regexp $match_string $output all func
diff --git a/repos/libports/run/ldso.run b/repos/libports/run/ldso.run
index 39703530a1..f54fdae55e 100644
--- a/repos/libports/run/ldso.run
+++ b/repos/libports/run/ldso.run
@@ -36,7 +36,7 @@ build_boot_image $boot_modules
append qemu_args "-nographic "
-run_genode_until {child ".*" exited with exit value 123.*\n} 10
+run_genode_until {child ".*" exited with exit value 123.*\n} 20
# pay only attention to the output of init and its children
grep_output {^\[init }
diff --git a/repos/libports/run/libc_getenv.run b/repos/libports/run/libc_getenv.run
index 312d783a98..3136b1253c 100644
--- a/repos/libports/run/libc_getenv.run
+++ b/repos/libports/run/libc_getenv.run
@@ -1,4 +1,4 @@
-build "core init drivers/timer test/libc_getenv"
+build "core init test/libc_getenv"
create_boot_directory
@@ -15,10 +15,6 @@ install_config {
-
-
-
-
@@ -36,13 +32,13 @@ install_config {
}
build_boot_image {
- core init timer test-libc_getenv
+ core init test-libc_getenv
ld.lib.so libc.lib.so libm.lib.so posix.lib.so
}
append qemu_args " -nographic "
-run_genode_until "child .* exited with exit value 0.*\n" 10
+run_genode_until "child .* exited with exit value 0.*\n" 20
grep_output {\[init -\> test-libc_getenv\]}
diff --git a/repos/libports/run/libc_pipe.run b/repos/libports/run/libc_pipe.run
index 5c3741c614..0cbb56c4a0 100644
--- a/repos/libports/run/libc_pipe.run
+++ b/repos/libports/run/libc_pipe.run
@@ -35,5 +35,5 @@ build_boot_image {
append qemu_args " -nographic "
-run_genode_until "child .* exited with exit value 0.*\n" 10
+run_genode_until "child .* exited with exit value 0.*\n" 20
diff --git a/repos/libports/run/pthread.run b/repos/libports/run/pthread.run
index cfc0541437..c3d522f3f3 100644
--- a/repos/libports/run/pthread.run
+++ b/repos/libports/run/pthread.run
@@ -17,7 +17,7 @@ install_config {
-
+
@@ -35,4 +35,4 @@ build_boot_image {
append qemu_args " -nographic "
-run_genode_until {--- returning from main ---.*\n} 10
+run_genode_until {--- returning from main ---.*\n} 20
diff --git a/repos/libports/run/rust.run b/repos/libports/run/rust.run
index 8c47b23ba7..0bdf1ab718 100644
--- a/repos/libports/run/rust.run
+++ b/repos/libports/run/rust.run
@@ -24,6 +24,6 @@ build_boot_image "core init test-rust ld.lib.so libc.lib.so libm.lib.so posix.li
append qemu_args "-nographic "
-run_genode_until { 42 } 10
+run_genode_until { 42 } 20
puts "Test succeeded"
diff --git a/repos/libports/run/stdcxx.run b/repos/libports/run/stdcxx.run
index 771190da32..355be08098 100644
--- a/repos/libports/run/stdcxx.run
+++ b/repos/libports/run/stdcxx.run
@@ -33,4 +33,4 @@ build_boot_image {
append qemu_args " -nographic "
-run_genode_until ".*test-stdcxx finished.*\n" 10
+run_genode_until ".*test-stdcxx finished.*\n" 20
diff --git a/repos/os/run/fb_bench.run b/repos/os/run/fb_bench.run
index 4d4bf9f7b5..99afe92dc0 100644
--- a/repos/os/run/fb_bench.run
+++ b/repos/os/run/fb_bench.run
@@ -107,4 +107,4 @@ build_boot_image $boot_modules
# disable QEMU graphic to enable testing on our machines without SDL and X
append qemu_args "-nographic "
-run_genode_until {.*--- Framebuffer benchmark finished ---.*\n} 30
+run_genode_until {.*--- Framebuffer benchmark finished ---.*\n} 40
diff --git a/repos/os/run/ram_fs_chunk.run b/repos/os/run/ram_fs_chunk.run
index f535e83bdc..d4f2013eb4 100644
--- a/repos/os/run/ram_fs_chunk.run
+++ b/repos/os/run/ram_fs_chunk.run
@@ -30,7 +30,7 @@ build_boot_image "core ld.lib.so init test-ram_fs_chunk"
append qemu_args "-nographic "
-run_genode_until {.*--- RAM filesystem chunk test finished ---.*\n} 10
+run_genode_until {.*--- RAM filesystem chunk test finished ---.*\n} 20
grep_output {^\[init -> test-ram_fs_chunk\]}
unify_output { sizeof=[0-9]+} {}
diff --git a/repos/os/run/rom_blk.run b/repos/os/run/rom_blk.run
index d9b4a448a3..0445497a3d 100644
--- a/repos/os/run/rom_blk.run
+++ b/repos/os/run/rom_blk.run
@@ -31,4 +31,4 @@ build_boot_image "core ld.lib.so init rom_blk test-rom_blk"
append qemu_args "-nographic "
-run_genode_until {.*--- ROM Block test finished ---.*\n} 10
+run_genode_until {.*--- ROM Block test finished ---.*\n} 20
diff --git a/repos/os/run/tar_rom.run b/repos/os/run/tar_rom.run
index 1c5314e199..210f146f2b 100644
--- a/repos/os/run/tar_rom.run
+++ b/repos/os/run/tar_rom.run
@@ -79,6 +79,6 @@ build_boot_image "core ld.lib.so init timer tar_rom archive.tar"
append qemu_args "-nographic "
-run_genode_until "--- timer test ---" 10
+run_genode_until "--- timer test ---" 20
exec rm bin/archive.tar
diff --git a/repos/os/run/thread_join.run b/repos/os/run/thread_join.run
index cb8a492be4..a1dfa82891 100644
--- a/repos/os/run/thread_join.run
+++ b/repos/os/run/thread_join.run
@@ -32,4 +32,4 @@ build_boot_image "core ld.lib.so init timer test-thread_join"
append qemu_args "-nographic "
-run_genode_until {.*--- Thread join test finished ---.*\n} 10
+run_genode_until {.*--- Thread join test finished ---.*\n} 20
diff --git a/repos/os/run/timed_semaphore.run b/repos/os/run/timed_semaphore.run
index 4e4729b74f..2f20ed81d4 100644
--- a/repos/os/run/timed_semaphore.run
+++ b/repos/os/run/timed_semaphore.run
@@ -54,4 +54,4 @@ build_boot_image $boot_modules
append qemu_args " -nographic "
-run_genode_until {.*--- Timed semaphore test finished ---.*\n} 10
+run_genode_until {.*--- Timed semaphore test finished ---.*\n} 20
diff --git a/repos/os/run/xml_node.run b/repos/os/run/xml_node.run
index 39ff5ec0dc..3705cb4c73 100644
--- a/repos/os/run/xml_node.run
+++ b/repos/os/run/xml_node.run
@@ -24,7 +24,7 @@ build_boot_image "core ld.lib.so init test-xml_node"
append qemu_args "-nographic "
-run_genode_until {.*child "test-xml_node" exited with exit value 0.*\n} 10
+run_genode_until {.*child "test-xml_node" exited with exit value 0.*\n} 20
# pay only attention to the output of init and its children
grep_output {^\[init \-\> test\-xml_node\]}