Log name of exiting child from Child::exit()

Fixes #1243.
devel
Christian Helmuth 9 years ago committed by Norman Feske
parent 53a7b4ca66
commit 0b5f901e58

@ -72,7 +72,7 @@ build_boot_image {
# Execute test case
#
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {child "test-libc_vfs" exited with exit value 0.*\n} 20
puts "\nTest succeeded\n"

@ -51,7 +51,7 @@ build_boot_image $boot_modules
# Execute test case
#
run_genode_until "child exited with exit value 0.*\n" 10
run_genode_until {child "test-lx_hybrid_ctors" exited with exit value 0.*\n} 10
#
# Compare output

@ -50,10 +50,7 @@ build_boot_image $boot_modules
# Execute test case
#
# qemu config
append qemu_args "-nographic -m 64 "
run_genode_until "child exited with exit value 0.*\n" 10
run_genode_until {child "test-lx_hybrid_exception" exited with exit value 0.*\n} 10
puts "Test succeeded"

@ -67,7 +67,11 @@ build_boot_image $boot_modules
# Execute test
#
run_genode_until "child exited with exit value 0.*\n" 10
if {$test_type eq "static"} {
run_genode_until {child "test-lx_rmap_static" exited with exit value 0.*\n} 10
} else {
run_genode_until {child "test-lx_rmap_dynamic" exited with exit value 0.*\n} 10
}
puts "Test succeeded"
# vi: set ft=tcl :

@ -94,7 +94,7 @@ namespace Genode {
*/
virtual void exit(int exit_value)
{
PDBG("child exited with exit value %d", exit_value);
PDBG("child \"%s\" exited with exit value %d", name(), exit_value);
}
/**

@ -30,7 +30,7 @@ append qemu_args "-nographic -m 64"
# increase expect buffer size, since there might be many log messages
match_max -d 100000
run_genode_until {child exited with exit value 0.*} 60
run_genode_until {child "test-cap_integrity" exited with exit value 0.*\n} 20
grep_output {\[init\] test message}
compare_output_to { }

@ -21,7 +21,7 @@ build_boot_image "core init test-new_delete"
append qemu_args "-nographic -m 64"
run_genode_until {child exited with exit value 0} 15
run_genode_until {child "test-new_delete" exited with exit value 0.*\n} 15
grep_output {^\[init -> test-new_delete\]}

@ -20,16 +20,16 @@ install_config {
<default-route>
<any-service> <parent/> </any-service>
</default-route>
<start name="test-rmfault">
<start name="test-rm_fault">
<resource name="RAM" quantum="10M"/>
</start>
</config>
}
build_boot_image "core init test-rmfault"
build_boot_image "core init test-rm_fault"
append qemu_args "-nographic -m 64"
run_genode_until {child exited with exit value 0.*} 10
run_genode_until {child "test-rm_fault" exited with exit value 0.*} 10
puts "Test succeeded"

@ -22,6 +22,6 @@ build_boot_image "core init test-thread"
append qemu_args "-nographic -m 64"
run_genode_until "child exited with exit value 0.*\n" 20
run_genode_until {child "test-thread" exited with exit value 0.*\n} 20
puts "Test succeeded"

@ -208,7 +208,7 @@ int main(int argc, char **argv)
/* obtain own elf file from rom service */
try {
static Rom_connection rom("test-rmfault");
static Rom_connection rom("test-rm_fault");
main_parent(rom.dataspace());
} catch (Genode::Rom_connection::Rom_connection_failed) {
main_child();

@ -1,3 +1,3 @@
TARGET = test-rmfault
TARGET = test-rm_fault
SRC_CC = main.cc
LIBS = base

@ -1,4 +1,4 @@
TARGET = test-rmnested
TARGET = test-rm_nested
REQUIRES = experimental
SRC_CC = main.cc
LIBS = base

@ -142,7 +142,7 @@ append qemu_args { \
-device usb-storage,bus=ehci.0,drive=disk \
-boot order=d }
run_genode_until {.*child exited with exit value 0.*} 100
run_genode_until {.*child "test-usb" exited with exit value 0.*} 100
puts "\nTest succeeded\n"

@ -128,7 +128,7 @@ build_boot_image $boot_modules
append qemu_args " -m 256 -nographic"
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
exec rm -f bin/$disk_image
puts "\nTest succeeded\n"

@ -90,7 +90,7 @@ build_boot_image $boot_modules
append qemu_args " -m 256 -nographic"
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
exec rm -f bin/ext2.raw
puts "\nTest succeeded\n"

@ -90,7 +90,7 @@ build_boot_image $boot_modules
append qemu_args " -m 256 -nographic"
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
exec rm -f bin/fs.raw
puts "\nTest succeeded\n"

@ -96,7 +96,7 @@ build_boot_image $boot_modules
append qemu_args "-nographic -m 64"
run_genode_until "child exited with exit value 0.*\n" 60
run_genode_until {child "test-iso" exited with exit value 0.*\n} 60
# pay only attention to the output of init and its children
grep_output {^\[init -> test-iso}

@ -33,10 +33,10 @@ install_config {
<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="timer">
<resource name="RAM" quantum="1M"/>
<provides> <service name="Timer"/> </provides>
</start>
<start name="test-expat">
<resource name="RAM" quantum="2M"/>
<config>
@ -70,18 +70,16 @@ build_boot_image {
append qemu_args " -nographic -m 64"
run_genode_until {.*child exited with exit value 0.*} 5
run_genode_until {.*child "test-expat" exited with exit value 0.*} 5
grep_output {\[init -> test-expat\] }
compare_output_to {
[init -> test-expat] start of element: config
[init -> test-expat] start of element: test_tag
[init -> test-expat] attribute: name='test_attribute', value='test_value'
[init -> test-expat] end of element: test_tag
[init -> test-expat] end of element: config
[init -> test-expat] start of element: config
[init -> test-expat] start of element: test_tag
[init -> test-expat] attribute: name='test_attribute', value='test_value'
[init -> test-expat] end of element: test_tag
[init -> test-expat] end of element: config
}
puts "\nTest succeeded\n"
# vi: set ft=tcl :

@ -163,7 +163,7 @@ append qemu_args " -m 128 -nographic "
append_if $use_atapi_drv qemu_args " -hda $disk_image -boot order=d "
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,if=sd,cache=writeback "
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_block" exited with exit value 0.*} 60
exec rm -f $disk_image

@ -155,7 +155,7 @@ append qemu_args " -m 128 -nographic "
append_if $use_atapi_drv qemu_args " -hda $disk_image -boot order=d "
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,if=sd,cache=writeback "
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
exec rm -f $disk_image

@ -215,7 +215,7 @@ append_if $use_atapi_drv qemu_args " -hda $disk_image -boot order=d "
append_if $use_ahci qemu_args " -drive id=disk,file=$disk_image,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0 -boot d"
append_if $use_sd_card_drv qemu_args " -drive file=$disk_image,if=sd,cache=writeback "
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until ".*child \"test-libc_$filesystem\" exited with exit value 0.*" 60
exec rm -f $disk_image

@ -105,7 +105,7 @@ build_boot_image $boot_modules
#
append qemu_args " -m 128 -nographic "
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_fs_tar_fs" exited with exit value 0.*} 60
#exec rm -rf bin/libc_fs_tar_fs
#exec rm -rf bin/libc_fs_tar_fs.tar

@ -68,7 +68,7 @@ build_boot_image {
#
append qemu_args " -m 128 -nographic "
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-libc_vfs" exited with exit value 0.*} 60
puts "\nTest succeeded\n"

@ -85,7 +85,7 @@ build_boot_image $boot_modules
append qemu_args " -m 128 -nographic "
run_genode_until {.*child exited with exit value 0.*} 60
run_genode_until {.*child "test-python" exited with exit value 0.*} 60
grep_output {test-python\] }
compare_output_to {

@ -31,7 +31,7 @@ build_boot_image "core init test-ldso test-ldso_lib_1.lib.so test-ldso_lib_2.lib
append qemu_args "-nographic -m 64"
run_genode_until "child exited with exit value 123.*\n" 10
run_genode_until {child ".*" exited with exit value 123.*\n} 10
# pay only attention to the output of init and its children
grep_output {^\[init }

@ -27,7 +27,7 @@ build_boot_image "core init test-ram_fs_chunk"
append qemu_args "-nographic -m 64"
run_genode_until "child exited with exit value 0.*\n" 10
run_genode_until {child "test-ram_fs_chunk" exited with exit value 0.*\n} 10
grep_output {^\[init -> test-ram_fs_chunk\]}
unify_output { sizeof=[0-9]+} {}

@ -46,7 +46,7 @@ build_boot_image "core init timer report_rom test-report_rom"
append qemu_args "-nographic -m 128"
run_genode_until {child exited with exit value 0.*\n} 30
run_genode_until {child "test-report_rom" exited with exit value 0.*\n} 30
grep_output {^\[init -> test-report_rom}

@ -35,6 +35,6 @@ build_boot_image "core init timer test-resource_request"
append qemu_args "-nographic -m 128"
run_genode_until {child exited with exit value 0.*\n} 30
run_genode_until {child "test-resource_request" exited with exit value 0.*\n} 30
puts "Test succeeded"

@ -34,6 +34,6 @@ build_boot_image "core init timer test-signal"
append qemu_args "-nographic -m 64"
run_genode_until {child exited with exit value 0.*} 200
run_genode_until {child "test-signal" exited with exit value 0.*} 200
puts "Test succeeded"

@ -27,14 +27,14 @@ build_boot_image "core init test-synced_interface"
append qemu_args "-nographic -m 64"
run_genode_until {child exited with exit value 0} 10
run_genode_until {child "test-synced_interface" exited with exit value 0} 10
grep_output {-> test-synced_interface}
compare_output_to {
[init -> test-synced_interface] lock
[init -> test-synced_interface] adding 13 + 14
[init -> test-synced_interface] unlock
[init -> test-synced_interface] result is 27
[init -> test-synced_interface] lock
[init -> test-synced_interface] adding 13 + 14
[init -> test-synced_interface] unlock
[init -> test-synced_interface] result is 27
}

@ -34,6 +34,6 @@ build_boot_image "core init timer test-thread_join"
append qemu_args "-nographic -m 64"
run_genode_until {child exited with exit value 0.*\n} 10
run_genode_until {child "test-thread_join" exited with exit value 0.*\n} 10
puts "Test succeeded"

@ -27,7 +27,7 @@ build_boot_image "core init test-volatile_object"
append qemu_args "-nographic -m 64"
run_genode_until {child exited with exit value 0.*\n} 10
run_genode_until {child "test-volatile_object" exited with exit value 0.*\n} 10
grep_output {-> test-volatile_object}

Loading…
Cancel
Save