Fix some details in run scripts

- don't use 'qemu -serial mon:stdio' anymore as it no longer works as
  expected
- use "bash -l" with [terminal] to read user's profile configuration,
  e.g., PATH settings
- added missing boot modules and cap quotas
This commit is contained in:
Christian Helmuth 2020-04-06 16:05:54 +02:00
parent bb34aafa45
commit cc4e21e7a7
9 changed files with 17 additions and 16 deletions

View File

@ -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
}

View File

@ -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

View File

@ -34,6 +34,7 @@ set config {
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
@ -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"

View File

@ -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]

View File

@ -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 "

View File

@ -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]

View File

@ -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]

View File

@ -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

View File

@ -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