diff --git a/repos/gems/run/fs_query.run b/repos/gems/run/fs_query.run
index 66da0aca2..02d2f400d 100644
--- a/repos/gems/run/fs_query.run
+++ b/repos/gems/run/fs_query.run
@@ -173,7 +173,7 @@ build { app/sequence app/fs_query }
build_boot_image { sequence fs_query }
-append qemu_args " -nographic -serial mon:stdio "
+append qemu_args " -nographic "
run_genode_until {.*child "test" exited with exit value 0.*\n} 50
@@ -183,7 +183,7 @@ set num_listings [regexp -all {report 'fs_query -> listing'} $output dummy]
# we expect at least four intermediate reports
if {$num_listings < 4} {
- puts "Error: too few reports generated"
+ puts "Error: Test failed with too few reports generated"
exit 1
}
diff --git a/repos/gems/run/vfs_import.run b/repos/gems/run/vfs_import.run
index 7a7a6cacd..9c2697a44 100644
--- a/repos/gems/run/vfs_import.run
+++ b/repos/gems/run/vfs_import.run
@@ -101,6 +101,6 @@ install_config {
build_boot_image { vfs_import.lib.so libc.lib.so vfs vfs.lib.so sequence }
-append qemu_args " -nographic -serial mon:stdio "
+append qemu_args " -nographic "
run_genode_until {Hello world!} 30
diff --git a/repos/os/run/uart.run b/repos/os/run/uart.run
index 014975ca4..9bdd832f9 100644
--- a/repos/os/run/uart.run
+++ b/repos/os/run/uart.run
@@ -34,6 +34,7 @@ set config {
+
@@ -75,7 +76,7 @@ set boot_modules {
}
build_boot_image $boot_modules
-append qemu_args " -nographic -serial mon:stdio"
+append qemu_args " -display none -serial stdio"
append qemu_args " -serial file:/tmp/serial1"
append qemu_args " -serial file:/tmp/serial2"
append qemu_args " -serial file:/tmp/serial3"
diff --git a/repos/ports/run/debug_nitpicker.run b/repos/ports/run/debug_nitpicker.run
index f7d4bcfaf..46414318e 100644
--- a/repos/ports/run/debug_nitpicker.run
+++ b/repos/ports/run/debug_nitpicker.run
@@ -129,7 +129,7 @@ set local_port 5555
# qemu config
# connect comport 0 to stdio
-append qemu_args " -serial mon:stdio "
+append qemu_args " -serial stdio "
# connect comport 1 with TCP port $local_port
append qemu_args " -serial chardev:uart "
@@ -162,7 +162,7 @@ append gdb_cmds {-ex "set interactive-mode auto" }
puts "command: [gdb] debug/ld.lib.so $gdb_cmds"
-exec [terminal] -e "[gdb] debug/ld.lib.so $gdb_cmds" &
+exec [terminal] -e "bash -lc \"[gdb] debug/ld.lib.so $gdb_cmds\"" &
interact -i [output_spawn_id]
diff --git a/repos/ports/run/gdb_monitor.run b/repos/ports/run/gdb_monitor.run
index a0a88e775..002c796d2 100644
--- a/repos/ports/run/gdb_monitor.run
+++ b/repos/ports/run/gdb_monitor.run
@@ -110,10 +110,10 @@ build_boot_image $boot_modules
set local_port 5555
# qemu config
-append qemu_args " -nographic "
+append qemu_args " -display none "
# connect comport 0 to stdio
-append qemu_args " -serial mon:stdio "
+append qemu_args " -serial stdio "
# connect comport 1 with TCP port $local_port
append qemu_args " -serial chardev:uart "
diff --git a/repos/ports/run/gdb_monitor_interactive.run b/repos/ports/run/gdb_monitor_interactive.run
index 0b8e0a10f..d5d9acec9 100644
--- a/repos/ports/run/gdb_monitor_interactive.run
+++ b/repos/ports/run/gdb_monitor_interactive.run
@@ -105,7 +105,7 @@ set local_port 5555
append qemu_args " -nographic "
# connect comport 0 to stdio
-append qemu_args " -serial mon:stdio "
+append qemu_args " -serial stdio "
# connect comport 1 with TCP port $local_port
append qemu_args " -serial chardev:uart "
@@ -138,7 +138,7 @@ append gdb_cmds {-ex "set interactive-mode auto" }
puts "command: [gdb] debug/ld.lib.so $gdb_cmds"
-exec [terminal] -e "[gdb] debug/ld.lib.so $gdb_cmds" &
+exec [terminal] -e "bash -lc \"[gdb] debug/ld.lib.so $gdb_cmds\"" &
interact -i [output_spawn_id]
diff --git a/repos/ports/run/gdb_monitor_target_config.run b/repos/ports/run/gdb_monitor_target_config.run
index ca87ba219..337a97b6f 100644
--- a/repos/ports/run/gdb_monitor_target_config.run
+++ b/repos/ports/run/gdb_monitor_target_config.run
@@ -89,7 +89,7 @@ proc binary_name_gdbserver_platform_lib_so { } {
# generic modules
set boot_modules {
core init timer
- ld.lib.so libc.lib.so vfs.lib.so libc_pipe.lib.so
+ ld.lib.so libc.lib.so libm.lib.so vfs.lib.so libc_pipe.lib.so stdcxx.lib.so
pc_uart_drv
gdb_monitor gdbserver_platform.lib.so test-gdb_monitor_target_config
}
@@ -103,10 +103,10 @@ build_boot_image $boot_modules
set local_port 5555
# qemu config
-append qemu_args " -nographic "
+append qemu_args " -display none "
# connect comport 0 to stdio
-append qemu_args " -serial mon:stdio "
+append qemu_args " -serial stdio "
# connect comport 1 with TCP port $local_port
append qemu_args " -serial chardev:uart "
@@ -137,7 +137,7 @@ append gdb_cmds [gdb_initial_breakpoint_cmds $gdb_target_binary]
# continue execution
append gdb_cmds {-ex "c" }
-exec [terminal] -e "[gdb] debug/ld.lib.so $gdb_cmds" &
+exec [terminal] -e "bash -lc \"[gdb] debug/ld.lib.so $gdb_cmds\"" &
interact -i [output_spawn_id]
diff --git a/repos/ports/run/genode_org.run b/repos/ports/run/genode_org.run
index 0b6282b28..280d2fbba 100644
--- a/repos/ports/run/genode_org.run
+++ b/repos/ports/run/genode_org.run
@@ -129,6 +129,6 @@ proc qemu_nic_model {} {
append qemu_args " -netdev user,id=net0,hostfwd=tcp::5555-:80 "
append qemu_args " -net nic,model=[qemu_nic_model],netdev=net0 "
-append qemu_args " -nographic -serial mon:stdio "
+append qemu_args " -nographic "
run_genode_until forever
diff --git a/repos/ports/run/lighttpd.run b/repos/ports/run/lighttpd.run
index 402fa6b29..49f26d363 100644
--- a/repos/ports/run/lighttpd.run
+++ b/repos/ports/run/lighttpd.run
@@ -114,7 +114,7 @@ proc qemu_nic_model {} {
append qemu_args " -netdev user,id=net0,hostfwd=tcp::5555-:80 "
append qemu_args " -net nic,model=[qemu_nic_model],netdev=net0 "
-append qemu_args " -nographic -serial mon:stdio "
+append qemu_args " -nographic "
append xen_args { sdl=0\; vif=\["model=e1000,mac=02:00:00:00:01:01,bridge=xenbr0"\] }
run_genode_until forever