From c47a6b0830afe17b57e9587cc1eaa006b743e228 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Sat, 24 Jun 2023 16:57:19 +0200 Subject: [PATCH] depot_autopilot: simplify success-criterion syntax * Removes the tag from all test package runtime files and replaces the contained and sub-tags with the new tags and . If a or tag has a content, it defines a log pattern that should be recognized and render the test failed or successful. If a or tag has an attribute after_seconds that is not set to 0, it defines a timeout after which the test should be rendered failed or successful. * Adapts the Depot Autopilot to support the new syntax in the test-package runtime files. However, for now, the Depot Autopilot is kept compatible to the old syntax as well. If the tag is present, it is prioritized over the new syntax. Fixes #4922 --- .../recipes/pkg/test-ds_ownership/runtime | 8 +- .../base/recipes/pkg/test-entrypoint/runtime | 6 +- repos/base/recipes/pkg/test-log/runtime | 8 +- repos/base/recipes/pkg/test-mmio/runtime | 8 +- .../base/recipes/pkg/test-new_delete/runtime | 8 +- .../recipes/pkg/test-reconstructible/runtime | 8 +- repos/base/recipes/pkg/test-registry/runtime | 8 +- repos/base/recipes/pkg/test-rm_fault/runtime | 8 +- .../recipes/pkg/test-rm_fault_no_nox/runtime | 6 +- repos/base/recipes/pkg/test-rm_nested/runtime | 8 +- repos/base/recipes/pkg/test-rm_stress/runtime | 8 +- repos/base/recipes/pkg/test-sanitizer/runtime | 8 +- .../base/recipes/pkg/test-stack_smash/runtime | 6 +- .../recipes/pkg/test-synced_interface/runtime | 8 +- repos/base/recipes/pkg/test-timer/runtime | 8 +- repos/base/recipes/pkg/test-tls/runtime | 8 +- repos/base/recipes/pkg/test-token/runtime | 6 +- .../recipes/pkg/test-xml_generator/runtime | 10 +- repos/base/recipes/pkg/test-xml_node/runtime | 10 +- .../pkg/test-depot_query_index/runtime | 10 +- .../pkg/test-file_vault_config_report/runtime | 30 +++--- .../runtime | 30 +++--- repos/gems/recipes/pkg/test-fs_tool/runtime | 8 +- .../recipes/pkg/test-libc_vfs_audit/runtime | 8 +- repos/gems/src/app/depot_autopilot/README | 38 +++----- repos/gems/src/app/depot_autopilot/child.cc | 94 ++++++++++++++++--- repos/libports/recipes/pkg/test-expat/runtime | 12 +-- repos/libports/recipes/pkg/test-ldso/runtime | 8 +- repos/libports/recipes/pkg/test-libc/runtime | 8 +- .../pkg/test-libc_connect_lwip/runtime | 10 +- .../pkg/test-libc_connect_lxip/runtime | 10 +- .../test-libc_connect_vfs_server_lwip/runtime | 10 +- .../test-libc_connect_vfs_server_lxip/runtime | 10 +- .../recipes/pkg/test-libc_counter/runtime | 8 +- .../recipes/pkg/test-libc_execve/runtime | 6 +- .../recipes/pkg/test-libc_fifo_pipe/runtime | 16 ++-- .../recipes/pkg/test-libc_fork/runtime | 6 +- .../recipes/pkg/test-libc_getenv/runtime | 8 +- .../recipes/pkg/test-libc_pipe/runtime | 8 +- .../recipes/pkg/test-libc_vfs/runtime | 8 +- .../recipes/pkg/test-libc_vfs_block/runtime | 23 ++--- .../recipes/pkg/test-libc_vfs_counter/runtime | 8 +- .../recipes/pkg/test-libc_vfs_fs/runtime | 8 +- .../pkg/test-libc_vfs_fs_chained/runtime | 8 +- .../recipes/pkg/test-libc_vfs_ram/runtime | 8 +- .../recipes/pkg/test-pipe_read_ready/runtime | 6 +- .../libports/recipes/pkg/test-pthread/runtime | 10 +- .../recipes/pkg/test-sequence/runtime | 10 +- repos/libports/recipes/pkg/test-spark/runtime | 6 +- .../recipes/pkg/test-spark_exception/runtime | 8 +- .../pkg/test-spark_secondary_stack/runtime | 8 +- .../libports/recipes/pkg/test-stdcxx/runtime | 6 +- .../recipes/pkg/test-tcp_bulk_lwip/runtime | 14 ++- .../recipes/pkg/test-tcp_bulk_lxip/runtime | 14 ++- repos/os/recipes/pkg/test-black_hole/runtime | 8 +- repos/os/recipes/pkg/test-clipboard/runtime | 18 ++-- .../recipes/pkg/test-dynamic_config/runtime | 12 +-- .../pkg/test-dynamic_config_loader/runtime | 8 +- .../recipes/pkg/test-fault_detection/runtime | 6 +- repos/os/recipes/pkg/test-fs_packet/runtime | 6 +- repos/os/recipes/pkg/test-fs_report/runtime | 14 ++- .../os/recipes/pkg/test-fs_rom_update/runtime | 6 +- .../recipes/pkg/test-fs_rom_update_fs/runtime | 10 +- .../pkg/test-fs_rom_update_ram/runtime | 10 +- repos/os/recipes/pkg/test-init/runtime | 10 +- repos/os/recipes/pkg/test-init_loop/runtime | 10 +- repos/os/recipes/pkg/test-lx_block/runtime | 12 +-- .../os/recipes/pkg/test-nic_loopback/runtime | 8 +- repos/os/recipes/pkg/test-nic_perf/runtime | 8 +- .../recipes/pkg/test-nic_perf_router/runtime | 8 +- .../recipes/pkg/test-part_block_ahdi/runtime | 20 ++-- .../recipes/pkg/test-part_block_disk/runtime | 20 ++-- .../recipes/pkg/test-part_block_gpt/runtime | 24 +++-- .../recipes/pkg/test-part_block_mbr/runtime | 28 +++--- .../os/recipes/pkg/test-ram_fs_chunk/runtime | 8 +- .../os/recipes/pkg/test-read_only_rom/runtime | 6 +- repos/os/recipes/pkg/test-report_rom/runtime | 13 +-- .../recipes/pkg/test-resource_request/runtime | 6 +- .../recipes/pkg/test-resource_yield/runtime | 8 +- repos/os/recipes/pkg/test-rom_filter/runtime | 30 +++--- repos/os/recipes/pkg/test-rtc/runtime | 8 +- repos/os/recipes/pkg/test-sandbox/runtime | 6 +- repos/os/recipes/pkg/test-signal/runtime | 8 +- repos/os/recipes/pkg/test-slab/runtime | 6 +- .../pkg/test-terminal_crosslink/runtime | 6 +- repos/os/recipes/pkg/test-trace/runtime | 14 ++- .../os/recipes/pkg/test-trace_buffer/runtime | 8 +- .../os/recipes/pkg/test-trace_logger/runtime | 45 +++------ repos/os/recipes/pkg/test-utf8/runtime | 8 +- repos/os/recipes/pkg/test-vfs_block/runtime | 38 ++++---- .../os/recipes/pkg/test-vfs_stress_fs/runtime | 6 +- .../recipes/pkg/test-vfs_stress_ram/runtime | 8 +- repos/os/recipes/pkg/test-weak_ptr/runtime | 8 +- 93 files changed, 481 insertions(+), 636 deletions(-) diff --git a/repos/base/recipes/pkg/test-ds_ownership/runtime b/repos/base/recipes/pkg/test-ds_ownership/runtime index 893bd7f1eb..850753c53f 100644 --- a/repos/base/recipes/pkg/test-ds_ownership/runtime +++ b/repos/base/recipes/pkg/test-ds_ownership/runtime @@ -1,10 +1,8 @@ - - - test succeeded - test failed - + + test succeeded + test failed diff --git a/repos/base/recipes/pkg/test-entrypoint/runtime b/repos/base/recipes/pkg/test-entrypoint/runtime index ec5da59e15..1435ee8261 100644 --- a/repos/base/recipes/pkg/test-entrypoint/runtime +++ b/repos/base/recipes/pkg/test-entrypoint/runtime @@ -1,9 +1,7 @@ - - - child "test-entrypoint" exited with exit value 0 - + + child "test-entrypoint" exited with exit value 0 diff --git a/repos/base/recipes/pkg/test-log/runtime b/repos/base/recipes/pkg/test-log/runtime index 4f5469b5b3..2ee443679c 100644 --- a/repos/base/recipes/pkg/test-log/runtime +++ b/repos/base/recipes/pkg/test-log/runtime @@ -1,8 +1,7 @@ - - - + + [init -> test-log] hex range: [0e00,1680) [init -> test-log] empty hex range: [0abc0000,0abc0000) (empty!) [init -> test-log] hex range to limit: [f8,ff] @@ -18,8 +17,7 @@ [init -> test-log] 5.....................................................................................................................................................................................................................................6 [init -> test-log] [init -> test-log] Test done. - - + diff --git a/repos/base/recipes/pkg/test-mmio/runtime b/repos/base/recipes/pkg/test-mmio/runtime index efae66e85c..738f3d935c 100644 --- a/repos/base/recipes/pkg/test-mmio/runtime +++ b/repos/base/recipes/pkg/test-mmio/runtime @@ -2,11 +2,9 @@ - - - child "test" exited with exit value 0 - child "test" exited with exit value -1 - + + child "test" exited with exit value 0 + child "test" exited with exit value -1 diff --git a/repos/base/recipes/pkg/test-new_delete/runtime b/repos/base/recipes/pkg/test-new_delete/runtime index 1239f74724..7c230a7522 100644 --- a/repos/base/recipes/pkg/test-new_delete/runtime +++ b/repos/base/recipes/pkg/test-new_delete/runtime @@ -1,9 +1,8 @@ - - + - + [init -> test-new_delete] Allocator::alloc() [init -> test-new_delete] A [init -> test-new_delete] C @@ -55,9 +54,8 @@ [init -> test-new_delete] Allocator::free() [init -> test-new_delete] exception caught [init -> test-new_delete] Test done - + - diff --git a/repos/base/recipes/pkg/test-reconstructible/runtime b/repos/base/recipes/pkg/test-reconstructible/runtime index a07a2b865f..741b784df0 100644 --- a/repos/base/recipes/pkg/test-reconstructible/runtime +++ b/repos/base/recipes/pkg/test-reconstructible/runtime @@ -1,8 +1,7 @@ - - - + + [init -> test-reconstructible] --- Reconstructible utility test --- [init -> test-reconstructible] construct Object 1 [init -> test-reconstructible] construct Object 2 @@ -36,8 +35,7 @@ [init -> test-reconstructible] construct Throwing -> throw exception [init -> test-reconstructible] got exception, as expected [init -> test-reconstructible] --- Reconstructible utility test finished --- - - + diff --git a/repos/base/recipes/pkg/test-registry/runtime b/repos/base/recipes/pkg/test-registry/runtime index a90d5aa113..ff1b41c3da 100644 --- a/repos/base/recipes/pkg/test-registry/runtime +++ b/repos/base/recipes/pkg/test-registry/runtime @@ -1,10 +1,8 @@ - - - child "test-registry" exited with exit value 0 - Uncaught exception - + + child "test-registry" exited with exit value 0 + Uncaught exception diff --git a/repos/base/recipes/pkg/test-rm_fault/runtime b/repos/base/recipes/pkg/test-rm_fault/runtime index 0c9f54c394..2de9a7d96c 100644 --- a/repos/base/recipes/pkg/test-rm_fault/runtime +++ b/repos/base/recipes/pkg/test-rm_fault/runtime @@ -1,10 +1,8 @@ - - - child "test-rm_fault" exited with exit value 0 - Error: could modify ROM - + + child "test-rm_fault" exited with exit value 0 + Error: could modify ROM diff --git a/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime b/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime index 6d4c0e6d94..b1095502bc 100644 --- a/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime +++ b/repos/base/recipes/pkg/test-rm_fault_no_nox/runtime @@ -1,9 +1,7 @@ - - - child "test-rm_fault" exited with exit value 0 - + + child "test-rm_fault" exited with exit value 0 diff --git a/repos/base/recipes/pkg/test-rm_nested/runtime b/repos/base/recipes/pkg/test-rm_nested/runtime index e49bc31b44..72d1e6cb44 100644 --- a/repos/base/recipes/pkg/test-rm_nested/runtime +++ b/repos/base/recipes/pkg/test-rm_nested/runtime @@ -1,10 +1,8 @@ - - - --- finished nested region map test --- - Error: - + + --- finished nested region map test --- + Error: diff --git a/repos/base/recipes/pkg/test-rm_stress/runtime b/repos/base/recipes/pkg/test-rm_stress/runtime index 4097dbb755..c295d68969 100644 --- a/repos/base/recipes/pkg/test-rm_stress/runtime +++ b/repos/base/recipes/pkg/test-rm_stress/runtime @@ -1,10 +1,8 @@ - - - child "test-rm_stress" exited with exit value 0 - child "test-rm_stress" exited with exit value -1 - + + child "test-rm_stress" exited with exit value 0 + child "test-rm_stress" exited with exit value -1 diff --git a/repos/base/recipes/pkg/test-sanitizer/runtime b/repos/base/recipes/pkg/test-sanitizer/runtime index f63a5a4854..e6938ca053 100644 --- a/repos/base/recipes/pkg/test-sanitizer/runtime +++ b/repos/base/recipes/pkg/test-sanitizer/runtime @@ -1,12 +1,10 @@ - - - + + [init]*runtime error: *index 2 out of bounds* [init]*runtime error: *store to null pointer - - + diff --git a/repos/base/recipes/pkg/test-stack_smash/runtime b/repos/base/recipes/pkg/test-stack_smash/runtime index ac5e16c3bd..1cb01c0a18 100644 --- a/repos/base/recipes/pkg/test-stack_smash/runtime +++ b/repos/base/recipes/pkg/test-stack_smash/runtime @@ -1,9 +1,7 @@ - - - Error: stack protector check failed - + + Error: stack protector check failed diff --git a/repos/base/recipes/pkg/test-synced_interface/runtime b/repos/base/recipes/pkg/test-synced_interface/runtime index de75881d15..302be0ddb5 100644 --- a/repos/base/recipes/pkg/test-synced_interface/runtime +++ b/repos/base/recipes/pkg/test-synced_interface/runtime @@ -1,16 +1,14 @@ - - - + + [init -> test-synced_interface] --- Synced interface test --- [init -> test-synced_interface] acquire [init -> test-synced_interface] adding 13 + 14 [init -> test-synced_interface] release [init -> test-synced_interface] result is 27 [init -> test-synced_interface] --- Synced interface test finished --- - - + diff --git a/repos/base/recipes/pkg/test-timer/runtime b/repos/base/recipes/pkg/test-timer/runtime index 06fccd5560..971ce5c10f 100644 --- a/repos/base/recipes/pkg/test-timer/runtime +++ b/repos/base/recipes/pkg/test-timer/runtime @@ -2,11 +2,9 @@ - - - [init] child "client" exited with exit value 0 - Error: - + + [init] child "client" exited with exit value 0 + Error: diff --git a/repos/base/recipes/pkg/test-tls/runtime b/repos/base/recipes/pkg/test-tls/runtime index 471fc010a0..286e58ce2c 100644 --- a/repos/base/recipes/pkg/test-tls/runtime +++ b/repos/base/recipes/pkg/test-tls/runtime @@ -1,16 +1,14 @@ - - - + + [init -> test-tls] main initial: x: -1, y: 0 [init -> test-tls] thread 0 initial: x: -1, y: 0 [init -> test-tls] thread 0 : x: 1, y: 2 [init -> test-tls] thread 1 initial: x: -1, y: 0 [init -> test-tls] thread 1 : x: 3, y: 4 [init -> test-tls] main : x: 5, y: 6 - - + diff --git a/repos/base/recipes/pkg/test-token/runtime b/repos/base/recipes/pkg/test-token/runtime index da90071a44..e30a607928 100644 --- a/repos/base/recipes/pkg/test-token/runtime +++ b/repos/base/recipes/pkg/test-token/runtime @@ -1,9 +1,7 @@ - - - finished token test - + + finished token test diff --git a/repos/base/recipes/pkg/test-xml_generator/runtime b/repos/base/recipes/pkg/test-xml_generator/runtime index cfb2746cdd..1f04982ae6 100644 --- a/repos/base/recipes/pkg/test-xml_generator/runtime +++ b/repos/base/recipes/pkg/test-xml_generator/runtime @@ -1,8 +1,7 @@ - - - + + [init -> test-xml_generator] --- XML generator test started --- [init -> test-xml_generator] [init -> test-xml_generator] used 308 bytes, result: @@ -56,9 +55,8 @@ [init -> test-xml_generator] [init -> test-xml_generator] --- XML generator test finished ---* [init] child "test-xml_generator" exited with exit value 0 - - Error: - + + Error: diff --git a/repos/base/recipes/pkg/test-xml_node/runtime b/repos/base/recipes/pkg/test-xml_node/runtime index e526210460..11766a652d 100644 --- a/repos/base/recipes/pkg/test-xml_node/runtime +++ b/repos/base/recipes/pkg/test-xml_node/runtime @@ -1,8 +1,7 @@ - - - + + [init -> test-xml_node] --- XML-token test --- [init -> test-xml_node] token type="SINGLECHAR", len=1, content="<" [init -> test-xml_node] token type="IDENT", len=6, content="config" @@ -113,9 +112,8 @@ [init -> test-xml_node] [init -> test-xml_node] --- End of XML-parser test ---* [init] child "test-xml_node" exited with exit value 0 - - Error: - + + Error: diff --git a/repos/gems/recipes/pkg/test-depot_query_index/runtime b/repos/gems/recipes/pkg/test-depot_query_index/runtime index db7fab68a6..3c055e5756 100644 --- a/repos/gems/recipes/pkg/test-depot_query_index/runtime +++ b/repos/gems/recipes/pkg/test-depot_query_index/runtime @@ -1,8 +1,7 @@ - - - + + [init -> report_rom] report 'depot_query -> index' [init -> report_rom] *<index> [init -> report_rom] <index user="genodelabs" version="19.02"> @@ -12,8 +11,7 @@ [init -> report_rom] </index> [init -> report_rom] <missing user="genodelabs" version="19.03"/> [init -> report_rom] </index> - - + @@ -56,7 +54,7 @@ - + diff --git a/repos/gems/recipes/pkg/test-file_vault_config_report/runtime b/repos/gems/recipes/pkg/test-file_vault_config_report/runtime index 911c226b0c..91ade441cd 100644 --- a/repos/gems/recipes/pkg/test-file_vault_config_report/runtime +++ b/repos/gems/recipes/pkg/test-file_vault_config_report/runtime @@ -4,16 +4,14 @@ - - - + + <ui_report version="step_*" state="uninitialized"/>* <ui_report version="step_*" state="initializing"/>* <ui_report version="step_*" state="unlocked"/>* <ui_report version="step_*" state="locked"/>* <ui_report version="step_*" state="unlocked"/>* - - + @@ -50,9 +48,7 @@ - + @@ -95,8 +91,8 @@ - - + + @@ -157,15 +153,15 @@ - + label="ui_report" - - - - - - + + + + + + diff --git a/repos/gems/recipes/pkg/test-file_vault_config_report_no_entropy/runtime b/repos/gems/recipes/pkg/test-file_vault_config_report_no_entropy/runtime index 2285b98cc7..676a90e92c 100644 --- a/repos/gems/recipes/pkg/test-file_vault_config_report_no_entropy/runtime +++ b/repos/gems/recipes/pkg/test-file_vault_config_report_no_entropy/runtime @@ -4,16 +4,14 @@ - - - + + <ui_report version="step_*" state="uninitialized"/>* <ui_report version="step_*" state="initializing"/>* <ui_report version="step_*" state="unlocked"/>* <ui_report version="step_*" state="locked"/>* <ui_report version="step_*" state="unlocked"/>* - - + @@ -50,9 +48,7 @@ - + @@ -95,8 +91,8 @@ - - + + @@ -157,15 +153,15 @@ - + label="ui_report" - - - - - - + + + + + + diff --git a/repos/gems/recipes/pkg/test-fs_tool/runtime b/repos/gems/recipes/pkg/test-fs_tool/runtime index 0ab37ab786..e7668e69d4 100644 --- a/repos/gems/recipes/pkg/test-fs_tool/runtime +++ b/repos/gems/recipes/pkg/test-fs_tool/runtime @@ -1,8 +1,7 @@ - - - + + [init -> test -> remove] *file /items cannot be removed because it is a directory* [init -> test -> remove] remove file /items/2* [init -> test -> remove] *file /3 cannot be removed because there is no such file* @@ -17,8 +16,7 @@ [init -> report_rom] <file name="content" writeable="yes">new file</file> [init -> report_rom] </dir> [init -> report_rom] </listing> - - + diff --git a/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime b/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime index cb9dfdd7f1..5fc226a804 100644 --- a/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime +++ b/repos/gems/recipes/pkg/test-libc_vfs_audit/runtime @@ -1,10 +1,8 @@ - - - child "test-libc_vfs" exited with exit value 0 - Error: - + + child "test-libc_vfs" exited with exit value 0 + Error: diff --git a/repos/gems/src/app/depot_autopilot/README b/repos/gems/src/app/depot_autopilot/README index fbfb71755a..8b6b1085aa 100644 --- a/repos/gems/src/app/depot_autopilot/README +++ b/repos/gems/src/app/depot_autopilot/README @@ -166,14 +166,12 @@ Besides the mandatory package content, a test package is expected to provide a ! ! ! -! -! -! Ignores tabs -! and newlines but no whitespaces ! -! Some XML: <my-node my_attr="123"/> -! [init -> test-example] Wildcarded *text *literal star * ampersand & -! -! +! +! Ignores tabs +! and newlines but no whitespaces ! +! Some XML: <my-node my_attr="123"/> +! [init -> test-example] Wildcarded *text *literal star * ampersand & +! ! ! ! @@ -213,32 +211,20 @@ Besides the mandatory package content, a test package is expected to provide a should not be part of a test sub-tree as we don't want to get into the situation of restarting them. -:: +:: +:: - Lists events that may occur during the test and that shall imply a reaction - by the Autopilot. + Let the test fail or succeed after a timeout given in seconds. -:: +:Error!: +:Done!: - This event occurs when the test execution lasts the given time in seconds. - -:: - - One of "succeeded", "failed". Both imply the test to be treated as finished - (gets terminated) with the test result set to the given value. - -:: - - Contains a string pattern. The event occurs as soon as the pattern could be + Let the test fail or succeed as soon as the pattern could be completely matched against the LOG-session output of the test. Tabs and newlines are ignored in the pattern as well as in the test output. Literal characters '<', '&', '*' in the pattern must be escaped as "<", "&", "*". A character '*' in the pattern is treated as non-greedy wildcard. -:: - - See . - :: Lists required files from the test-package build besides the root-component diff --git a/repos/gems/src/app/depot_autopilot/child.cc b/repos/gems/src/app/depot_autopilot/child.cc index 07978439d4..00fb050ca0 100644 --- a/repos/gems/src/app/depot_autopilot/child.cc +++ b/repos/gems/src/app/depot_autopilot/child.cc @@ -337,20 +337,65 @@ void Child::gen_start_node(Xml_generator &xml, uint64_t max_timeout_sec = 0; try { - Xml_node const events = _pkg_xml->xml().sub_node("runtime").sub_node("events"); - events.for_each_sub_node("timeout", [&] (Xml_node const &event) { - try { - Timeout_event &timeout = *new (_alloc) Timeout_event(_timer, *this, event); - if (timeout.sec() > max_timeout_sec) { - max_timeout_sec = timeout.sec(); + Xml_node const runtime = _pkg_xml->xml().sub_node("runtime"); + + /* + * The check for the node is made only for compatibility with + * the old (< Genode 23.08) success-criterion syntax and can be removed + * after an appropriate transition period. + */ + if (runtime.has_sub_node("events")) { + + Xml_node const events = runtime.sub_node("events"); + events.for_each_sub_node("timeout", [&] (Xml_node const &event) { + try { + Timeout_event &timeout = *new (_alloc) Timeout_event(_timer, *this, event); + if (timeout.sec() > max_timeout_sec) { + max_timeout_sec = timeout.sec(); + } + _timeout_events.insert(&timeout); } - _timeout_events.insert(&timeout); - } - catch (Timeout_event::Invalid) { warning("Invalid timeout event"); } - }); - events.for_each_sub_node("log", [&] (Xml_node const &event) { - _log_events.insert(new (_alloc) Log_event(_alloc, event)); - }); + catch (Timeout_event::Invalid) { warning("Invalid timeout event"); } + }); + events.for_each_sub_node("log", [&] (Xml_node const &event) { + _log_events.insert(new (_alloc) Log_event(_alloc, event)); + }); + + } else { + + runtime.for_each_sub_node("succeed", [&] (Xml_node const &event) { + + if (event.has_attribute("after_seconds")) { + try { + Timeout_event &timeout = *new (_alloc) Timeout_event(_timer, *this, event); + if (timeout.sec() > max_timeout_sec) { + max_timeout_sec = timeout.sec(); + } + _timeout_events.insert(&timeout); + } + catch (Timeout_event::Invalid) { warning("Invalid timeout event"); } + } + event.with_raw_content([&] (char const *, size_t) { + _log_events.insert(new (_alloc) Log_event(_alloc, event)); + }); + }); + runtime.for_each_sub_node("fail", [&] (Xml_node const &event) { + + if (event.has_attribute("after_seconds")) { + try { + Timeout_event &timeout = *new (_alloc) Timeout_event(_timer, *this, event); + if (timeout.sec() > max_timeout_sec) { + max_timeout_sec = timeout.sec(); + } + _timeout_events.insert(&timeout); + } + catch (Timeout_event::Invalid) { warning("Invalid timeout event"); } + } + event.with_raw_content([&] (char const *, size_t) { + _log_events.insert(new (_alloc) Log_event(_alloc, event)); + }); + }); + } } catch (...) { } log(""); @@ -861,7 +906,17 @@ Timeout_event::Timeout_event(Timer::Connection &timer, Event { event, Type::TIMEOUT }, _child { child }, _timer { timer }, - _sec { event.attribute_value("sec", (uint64_t)0) }, + + /* + * The check for the type "timeout" is made only for + * compatibility with the old (< Genode 23.08) success-criterion syntax + * and can be removed after an appropriate transition period. + */ + _sec { event.type() == "fail" || event.type() == "succeed" ? + event.attribute_value("after_seconds", (uint64_t)0) : + event.type() == "timeout" ? + event.attribute_value("sec", (uint64_t)0) : 0 }, + _timeout { timer, *this, &Timeout_event::_handle_timeout } { if (!_sec) { @@ -1043,7 +1098,16 @@ Log_event::Log_event(Allocator &alloc, Event::Event(Xml_node const &node, Type type) : - _meaning { node.attribute_value("meaning", Meaning_string()) }, + /* + * The check for the types "timeout" and "log" is made only for + * compatibility with the old (< Genode 23.08) success-criterion syntax + * and can be removed after an appropriate transition period. + */ + _meaning { node.type() == "succeed" ? "succeeded" : + node.type() == "fail" ? "failed" : + node.type() == "timeout" || node.type() == "log" ? + node.attribute_value("meaning", Meaning_string()) : "" }, + _type { type } { if (_meaning != Meaning_string("failed") && diff --git a/repos/libports/recipes/pkg/test-expat/runtime b/repos/libports/recipes/pkg/test-expat/runtime index 2c91622524..e53a29bf1d 100644 --- a/repos/libports/recipes/pkg/test-expat/runtime +++ b/repos/libports/recipes/pkg/test-expat/runtime @@ -2,18 +2,16 @@ - - - + + [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] child "test-expat" exited with exit value 0 - - Error: - + + Error: @@ -45,7 +43,7 @@ - + diff --git a/repos/libports/recipes/pkg/test-ldso/runtime b/repos/libports/recipes/pkg/test-ldso/runtime index b6d8d2f8cc..893e51f814 100644 --- a/repos/libports/recipes/pkg/test-ldso/runtime +++ b/repos/libports/recipes/pkg/test-ldso/runtime @@ -2,9 +2,8 @@ - - - + + [init -> test-ldso] Lib_2_global 0x11223343* [init -> test-ldso] Lib_1_global_1 0x5060707* [init -> test-ldso] Lib_1_global_2 0x1020303* @@ -102,8 +101,7 @@ [init -> test-ldso] attr_destructor_2 0x4030200d* [init -> test-ldso] attr_destructor_1 0x8070604c* [init] child "test-ldso" exited with exit value 123 - - + diff --git a/repos/libports/recipes/pkg/test-libc/runtime b/repos/libports/recipes/pkg/test-libc/runtime index 776d415cb4..411212a4e8 100644 --- a/repos/libports/recipes/pkg/test-libc/runtime +++ b/repos/libports/recipes/pkg/test-libc/runtime @@ -2,11 +2,9 @@ - - - child "test-libc" exited with exit value 0 - test-libc] Error: - + + child "test-libc" exited with exit value 0 + test-libc] Error: diff --git a/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime b/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime index b41bc33ab6..cbee9905ac 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_lwip/runtime @@ -2,11 +2,9 @@ - - - exited with exit value -1 - child "test-libc_connect" exited with exit value 0 - + + exited with exit value -1 + child "test-libc_connect" exited with exit value 0 @@ -73,7 +71,7 @@ - + diff --git a/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime b/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime index 324fcda299..5df3ba35fa 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_lxip/runtime @@ -2,11 +2,9 @@ - - - exited with exit value -1 - child "test-libc_connect" exited with exit value 0 - + + exited with exit value -1 + child "test-libc_connect" exited with exit value 0 @@ -74,7 +72,7 @@ - + diff --git a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime index f362befcf6..f05a16a748 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lwip/runtime @@ -2,11 +2,9 @@ - - - exited with exit value -1 - child "test-libc_connect" exited with exit value 0 - + + exited with exit value -1 + child "test-libc_connect" exited with exit value 0 @@ -94,7 +92,7 @@ - + diff --git a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime index de72666540..a369665ccb 100644 --- a/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime +++ b/repos/libports/recipes/pkg/test-libc_connect_vfs_server_lxip/runtime @@ -2,11 +2,9 @@ - - - exited with exit value -1 - child "test-libc_connect" exited with exit value 0 - + + exited with exit value -1 + child "test-libc_connect" exited with exit value 0 @@ -95,7 +93,7 @@ - + diff --git a/repos/libports/recipes/pkg/test-libc_counter/runtime b/repos/libports/recipes/pkg/test-libc_counter/runtime index 7d70a3ddfc..7571ac2e7c 100644 --- a/repos/libports/recipes/pkg/test-libc_counter/runtime +++ b/repos/libports/recipes/pkg/test-libc_counter/runtime @@ -2,11 +2,9 @@ - - - child "test-libc_counter-sink" exited with exit value 0 - Error: - + + child "test-libc_counter-sink" exited with exit value 0 + Error: diff --git a/repos/libports/recipes/pkg/test-libc_execve/runtime b/repos/libports/recipes/pkg/test-libc_execve/runtime index ace7696ee5..3545594ac8 100644 --- a/repos/libports/recipes/pkg/test-libc_execve/runtime +++ b/repos/libports/recipes/pkg/test-libc_execve/runtime @@ -2,10 +2,8 @@ - - - child "test-execve" exited with exit value 0 - + + child "test-execve" exited with exit value 0 diff --git a/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime b/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime index 93c17ec379..d0fe60e8d3 100644 --- a/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime +++ b/repos/libports/recipes/pkg/test-libc_fifo_pipe/runtime @@ -1,10 +1,8 @@ - - - --- test succeeded --- - Error: - + + --- test succeeded --- + Error: @@ -43,8 +41,8 @@ - - + + @@ -140,8 +138,8 @@ - - + + diff --git a/repos/libports/recipes/pkg/test-libc_fork/runtime b/repos/libports/recipes/pkg/test-libc_fork/runtime index 57914546ea..b041676ae5 100644 --- a/repos/libports/recipes/pkg/test-libc_fork/runtime +++ b/repos/libports/recipes/pkg/test-libc_fork/runtime @@ -2,10 +2,8 @@ - - - --- parent done ---*child*exited* - + + --- parent done ---*child*exited* diff --git a/repos/libports/recipes/pkg/test-libc_getenv/runtime b/repos/libports/recipes/pkg/test-libc_getenv/runtime index 62c80218c4..9c7b069677 100644 --- a/repos/libports/recipes/pkg/test-libc_getenv/runtime +++ b/repos/libports/recipes/pkg/test-libc_getenv/runtime @@ -1,14 +1,12 @@ - - - + + [init -> test-libc_getenv] foo="bar"* [init -> test-libc_getenv] bar="foo"* [init -> test-libc_getenv] baz="(null)"* [init] child "test-libc_getenv" exited with exit value 0 - - + diff --git a/repos/libports/recipes/pkg/test-libc_pipe/runtime b/repos/libports/recipes/pkg/test-libc_pipe/runtime index 726b9ae844..fa12b257bd 100644 --- a/repos/libports/recipes/pkg/test-libc_pipe/runtime +++ b/repos/libports/recipes/pkg/test-libc_pipe/runtime @@ -1,10 +1,8 @@ - - - child "sequence" exited with exit value 0 - Error: - + + child "sequence" exited with exit value 0 + Error: diff --git a/repos/libports/recipes/pkg/test-libc_vfs/runtime b/repos/libports/recipes/pkg/test-libc_vfs/runtime index f8d30ead61..ac084d4990 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs/runtime @@ -1,10 +1,8 @@ - - - child "test-libc_vfs" exited with exit value 0 - Error: - + + child "test-libc_vfs" exited with exit value 0 + Error: diff --git a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime index a4bf063c52..3809ea9ab7 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_block/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_block/runtime @@ -1,10 +1,8 @@ - - - child "test-libc_vfs_block" exited with exit value 0 - Error: - + + child "test-libc_vfs_block" exited with exit value 0 + Error: @@ -37,8 +35,7 @@ - + @@ -50,31 +47,31 @@ - + - + - - + + write operation by reading back the content. --> - + - + diff --git a/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime b/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime index d2952d98ce..9c56d5ffe6 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_counter/runtime @@ -2,11 +2,9 @@ - - - child "test-libc_counter-sink" exited with exit value 0 - Error: - + + child "test-libc_counter-sink" exited with exit value 0 + Error: diff --git a/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime b/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime index d48a6de44b..f781239558 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_fs/runtime @@ -1,10 +1,8 @@ - - - child "test-libc_vfs" exited with exit value 0 - Error: - + + child "test-libc_vfs" exited with exit value 0 + Error: diff --git a/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime b/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime index 0167fd2bdb..7ec9bc45db 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_fs_chained/runtime @@ -1,10 +1,8 @@ - - - child "test-libc_vfs" exited with exit value 0 - [init -> test-libc_vfs] Error: - + + child "test-libc_vfs" exited with exit value 0 + [init -> test-libc_vfs] Error: diff --git a/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime b/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime index 943ce49aa8..f3212be89e 100644 --- a/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime +++ b/repos/libports/recipes/pkg/test-libc_vfs_ram/runtime @@ -1,10 +1,8 @@ - - - child "test-libc_vfs" exited with exit value 0 - Error: - + + child "test-libc_vfs" exited with exit value 0 + Error: diff --git a/repos/libports/recipes/pkg/test-pipe_read_ready/runtime b/repos/libports/recipes/pkg/test-pipe_read_ready/runtime index b06ff5624a..cbd8e2943f 100644 --- a/repos/libports/recipes/pkg/test-pipe_read_ready/runtime +++ b/repos/libports/recipes/pkg/test-pipe_read_ready/runtime @@ -2,10 +2,8 @@ - - - [init -> select] 3 - + + [init -> select] 3 diff --git a/repos/libports/recipes/pkg/test-pthread/runtime b/repos/libports/recipes/pkg/test-pthread/runtime index 4c27406965..1c2a9a8283 100644 --- a/repos/libports/recipes/pkg/test-pthread/runtime +++ b/repos/libports/recipes/pkg/test-pthread/runtime @@ -2,12 +2,10 @@ - - - --- returning from main --- - Error: - child "test-pthread" exited - + + --- returning from main --- + Error: + child "test-pthread" exited diff --git a/repos/libports/recipes/pkg/test-sequence/runtime b/repos/libports/recipes/pkg/test-sequence/runtime index 63d6873a45..062f196ddf 100644 --- a/repos/libports/recipes/pkg/test-sequence/runtime +++ b/repos/libports/recipes/pkg/test-sequence/runtime @@ -1,8 +1,7 @@ - - - + + [init -> sequence -> test_1] foo="bar1"* [init -> sequence -> test_1] bar1="(null)"* [init -> sequence -> test_1] baz="(null)"* @@ -13,9 +12,8 @@ [init -> sequence -> test_3] bar3="(null)"* [init -> sequence -> test_3] baz="(null)"* [init] child "sequence" exited with exit value 0 - - Error: - + + Error: diff --git a/repos/libports/recipes/pkg/test-spark/runtime b/repos/libports/recipes/pkg/test-spark/runtime index 01a8da48e0..6715e1eff2 100644 --- a/repos/libports/recipes/pkg/test-spark/runtime +++ b/repos/libports/recipes/pkg/test-spark/runtime @@ -1,9 +1,7 @@ - - - child "test-spark" exited with exit value 0 - + + child "test-spark" exited with exit value 0 diff --git a/repos/libports/recipes/pkg/test-spark_exception/runtime b/repos/libports/recipes/pkg/test-spark_exception/runtime index fe7cda91c1..780fa71884 100644 --- a/repos/libports/recipes/pkg/test-spark_exception/runtime +++ b/repos/libports/recipes/pkg/test-spark_exception/runtime @@ -1,14 +1,12 @@ - - - + + [init -> test-spark_exception] Ada exception test* [init -> test-spark_exception]*Error: Exception raised: explicit raise in except.adb:6* [init -> test-spark_exception] Caught Ada::Exception::Program_Error* [init] child "test-spark_exception" exited with exit value 0 - - + diff --git a/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime b/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime index 40d659e4b7..1167688d87 100644 --- a/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime +++ b/repos/libports/recipes/pkg/test-spark_secondary_stack/runtime @@ -1,12 +1,10 @@ - - - + + [init -> test-spark_secondary_stack] secondary stack test successful [init] child "test-spark_secondary_stack" exited with exit value 0 - - + diff --git a/repos/libports/recipes/pkg/test-stdcxx/runtime b/repos/libports/recipes/pkg/test-stdcxx/runtime index 3e9bd618df..bb6bd197ab 100644 --- a/repos/libports/recipes/pkg/test-stdcxx/runtime +++ b/repos/libports/recipes/pkg/test-stdcxx/runtime @@ -1,9 +1,7 @@ - - - test-stdcxx finished - + + test-stdcxx finished diff --git a/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime b/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime index 0ed8998b02..f722394cac 100644 --- a/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime +++ b/repos/libports/recipes/pkg/test-tcp_bulk_lwip/runtime @@ -2,10 +2,8 @@ - - - child "sequence" exited with exit value 0 - + + child "sequence" exited with exit value 0 @@ -42,10 +40,10 @@ - - - - + + + + diff --git a/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime b/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime index e5a5592ce6..d6e9f940f5 100644 --- a/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime +++ b/repos/libports/recipes/pkg/test-tcp_bulk_lxip/runtime @@ -2,10 +2,8 @@ - - - child "sequence" exited with exit value 0 - + + child "sequence" exited with exit value 0 @@ -43,10 +41,10 @@ - - - - + + + + diff --git a/repos/os/recipes/pkg/test-black_hole/runtime b/repos/os/recipes/pkg/test-black_hole/runtime index 967172ecd4..308a155cf1 100644 --- a/repos/os/recipes/pkg/test-black_hole/runtime +++ b/repos/os/recipes/pkg/test-black_hole/runtime @@ -2,10 +2,8 @@ - - - Finished - + + Finished @@ -72,7 +70,7 @@ - + diff --git a/repos/os/recipes/pkg/test-clipboard/runtime b/repos/os/recipes/pkg/test-clipboard/runtime index 9df3ccab21..31397cd697 100644 --- a/repos/os/recipes/pkg/test-clipboard/runtime +++ b/repos/os/recipes/pkg/test-clipboard/runtime @@ -2,10 +2,8 @@ - - - -- state WAIT_FOR_SUCCESS -- - + + -- state WAIT_FOR_SUCCESS -- @@ -48,13 +46,13 @@ - - - + + + - - - + + + diff --git a/repos/os/recipes/pkg/test-dynamic_config/runtime b/repos/os/recipes/pkg/test-dynamic_config/runtime index 37b06135b9..c621b48b57 100644 --- a/repos/os/recipes/pkg/test-dynamic_config/runtime +++ b/repos/os/recipes/pkg/test-dynamic_config/runtime @@ -2,12 +2,10 @@ - - - + + [init -> test-dynamic_config] obtained counter value 11 from config - - + @@ -32,7 +30,7 @@ - + @@ -40,7 +38,7 @@ - + diff --git a/repos/os/recipes/pkg/test-dynamic_config_loader/runtime b/repos/os/recipes/pkg/test-dynamic_config_loader/runtime index 00d6913e6d..be0ae3c8cc 100644 --- a/repos/os/recipes/pkg/test-dynamic_config_loader/runtime +++ b/repos/os/recipes/pkg/test-dynamic_config_loader/runtime @@ -2,12 +2,10 @@ - - - + + [init -> loader -> test-dynamic_config_loader -> -> test-label] obtained counter value 11 from config - - + diff --git a/repos/os/recipes/pkg/test-fault_detection/runtime b/repos/os/recipes/pkg/test-fault_detection/runtime index 84bf32460e..2462ad777a 100644 --- a/repos/os/recipes/pkg/test-fault_detection/runtime +++ b/repos/os/recipes/pkg/test-fault_detection/runtime @@ -1,9 +1,7 @@ - - - --- finished fault_detection test --- - + + --- finished fault_detection test --- diff --git a/repos/os/recipes/pkg/test-fs_packet/runtime b/repos/os/recipes/pkg/test-fs_packet/runtime index f1a74dec15..d44c34dc51 100644 --- a/repos/os/recipes/pkg/test-fs_packet/runtime +++ b/repos/os/recipes/pkg/test-fs_packet/runtime @@ -2,10 +2,8 @@ - - - child "short-test" exited with exit value 0 - + + child "short-test" exited with exit value 0 diff --git a/repos/os/recipes/pkg/test-fs_report/runtime b/repos/os/recipes/pkg/test-fs_report/runtime index 80903b87b2..4e956364fa 100644 --- a/repos/os/recipes/pkg/test-fs_report/runtime +++ b/repos/os/recipes/pkg/test-fs_report/runtime @@ -2,11 +2,9 @@ - - - child "test-fs_report" exited with exit value 0 - child "test-fs_report" exited with exit value -1 - + + child "test-fs_report" exited with exit value 0 + child "test-fs_report" exited with exit value -1 @@ -49,7 +47,7 @@ - + @@ -71,8 +69,8 @@ - - + + diff --git a/repos/os/recipes/pkg/test-fs_rom_update/runtime b/repos/os/recipes/pkg/test-fs_rom_update/runtime index 51249f1691..b489f267f5 100644 --- a/repos/os/recipes/pkg/test-fs_rom_update/runtime +++ b/repos/os/recipes/pkg/test-fs_rom_update/runtime @@ -2,10 +2,8 @@ - - - <config iteration="4"/> - + + <config iteration="4"/> diff --git a/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime b/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime index 7ba3242bb6..0eae38575d 100644 --- a/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime +++ b/repos/os/recipes/pkg/test-fs_rom_update_fs/runtime @@ -2,10 +2,8 @@ - - - <config iteration="4"/> - + + <config iteration="4"/> @@ -88,7 +86,7 @@ - + @@ -97,7 +95,7 @@ - + diff --git a/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime b/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime index f4046e0bd0..2e67433e35 100644 --- a/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime +++ b/repos/os/recipes/pkg/test-fs_rom_update_ram/runtime @@ -2,10 +2,8 @@ - - - <config iteration="4"/> - + + <config iteration="4"/> @@ -73,7 +71,7 @@ - + @@ -82,7 +80,7 @@ - + diff --git a/repos/os/recipes/pkg/test-init/runtime b/repos/os/recipes/pkg/test-init/runtime index 74fd529b5d..31b298bb84 100644 --- a/repos/os/recipes/pkg/test-init/runtime +++ b/repos/os/recipes/pkg/test-init/runtime @@ -2,11 +2,9 @@ - - - child "test-init" exited with exit value 0 - list model not empty at destruction time - + + child "test-init" exited with exit value 0 + list model not empty at destruction time @@ -39,7 +37,7 @@ - + diff --git a/repos/os/recipes/pkg/test-init_loop/runtime b/repos/os/recipes/pkg/test-init_loop/runtime index 3db7c12fed..47b37df06c 100644 --- a/repos/os/recipes/pkg/test-init_loop/runtime +++ b/repos/os/recipes/pkg/test-init_loop/runtime @@ -2,11 +2,9 @@ - - - child "test-init_loop" exited with exit value 0 - test-init_loop] Error: - + + child "test-init_loop" exited with exit value 0 + test-init_loop] Error: @@ -33,7 +31,7 @@ - + diff --git a/repos/os/recipes/pkg/test-lx_block/runtime b/repos/os/recipes/pkg/test-lx_block/runtime index 85e6e4f5e5..e10cb0c4dc 100644 --- a/repos/os/recipes/pkg/test-lx_block/runtime +++ b/repos/os/recipes/pkg/test-lx_block/runtime @@ -2,11 +2,9 @@ - - - child "block_tester" exited with exit value 0 - Error: - + + child "block_tester" exited with exit value 0 + Error: @@ -39,7 +37,7 @@ - + @@ -47,7 +45,7 @@ - + diff --git a/repos/os/recipes/pkg/test-nic_loopback/runtime b/repos/os/recipes/pkg/test-nic_loopback/runtime index a30ffb172e..cd12921555 100644 --- a/repos/os/recipes/pkg/test-nic_loopback/runtime +++ b/repos/os/recipes/pkg/test-nic_loopback/runtime @@ -1,10 +1,8 @@ - - - child "test-nic_loopback" exited with exit value 0 - Error: - + + child "test-nic_loopback" exited with exit value 0 + Error: diff --git a/repos/os/recipes/pkg/test-nic_perf/runtime b/repos/os/recipes/pkg/test-nic_perf/runtime index f434095992..964359aeed 100644 --- a/repos/os/recipes/pkg/test-nic_perf/runtime +++ b/repos/os/recipes/pkg/test-nic_perf/runtime @@ -2,12 +2,10 @@ - - - + + [init] child "nic_perf_tx" exited with exit value 0 - - + diff --git a/repos/os/recipes/pkg/test-nic_perf_router/runtime b/repos/os/recipes/pkg/test-nic_perf_router/runtime index 4246f3db87..e9f8f770c1 100644 --- a/repos/os/recipes/pkg/test-nic_perf_router/runtime +++ b/repos/os/recipes/pkg/test-nic_perf_router/runtime @@ -2,12 +2,10 @@ - - - + + [init] child "nic_perf_tx" exited with exit value 0 - - + diff --git a/repos/os/recipes/pkg/test-part_block_ahdi/runtime b/repos/os/recipes/pkg/test-part_block_ahdi/runtime index 9411bc1ec3..2f19e9ed80 100644 --- a/repos/os/recipes/pkg/test-part_block_ahdi/runtime +++ b/repos/os/recipes/pkg/test-part_block_ahdi/runtime @@ -2,13 +2,11 @@ - - - + + child "test-part*" exited with exit value 0 - - Error: - + + Error: @@ -47,8 +45,8 @@ - - + + @@ -62,19 +60,19 @@ - + - + - + diff --git a/repos/os/recipes/pkg/test-part_block_disk/runtime b/repos/os/recipes/pkg/test-part_block_disk/runtime index fc186d3e59..e4456a9119 100644 --- a/repos/os/recipes/pkg/test-part_block_disk/runtime +++ b/repos/os/recipes/pkg/test-part_block_disk/runtime @@ -2,13 +2,11 @@ - - - + + child "test-part*" exited with exit value 0 - - Error: - + + Error: @@ -47,8 +45,8 @@ - - + + @@ -62,19 +60,19 @@ - + - + - + diff --git a/repos/os/recipes/pkg/test-part_block_gpt/runtime b/repos/os/recipes/pkg/test-part_block_gpt/runtime index 40d07b3f51..f838f1cd43 100644 --- a/repos/os/recipes/pkg/test-part_block_gpt/runtime +++ b/repos/os/recipes/pkg/test-part_block_gpt/runtime @@ -2,14 +2,12 @@ - - - + + child "test-part*" exited with exit value 0* child "test-part*" exited with exit value 0 - - Error: - + + Error: @@ -48,8 +46,8 @@ - - + + @@ -64,31 +62,31 @@ - + - + - + - + - + diff --git a/repos/os/recipes/pkg/test-part_block_mbr/runtime b/repos/os/recipes/pkg/test-part_block_mbr/runtime index a37c83661b..b9073257ff 100644 --- a/repos/os/recipes/pkg/test-part_block_mbr/runtime +++ b/repos/os/recipes/pkg/test-part_block_mbr/runtime @@ -2,15 +2,13 @@ - - - + + child "test-part*" exited with exit value 0* child "test-part*" exited with exit value 0* child "test-part*" exited with exit value 0 - - Error: - + + Error: @@ -49,8 +47,8 @@ - - + + @@ -66,43 +64,43 @@ - + - + - + - + - + - + - + diff --git a/repos/os/recipes/pkg/test-ram_fs_chunk/runtime b/repos/os/recipes/pkg/test-ram_fs_chunk/runtime index bab0046335..23fe87da7c 100644 --- a/repos/os/recipes/pkg/test-ram_fs_chunk/runtime +++ b/repos/os/recipes/pkg/test-ram_fs_chunk/runtime @@ -1,8 +1,7 @@ - - - + + [init -> test-ram_fs_chunk] --- RAM filesystem chunk test --- [init -> test-ram_fs_chunk] chunk sizes [init -> test-ram_fs_chunk] level 0: payload=120 * @@ -45,8 +44,7 @@ [init -> test-ram_fs_chunk] trunc(1) -> content (size=1): "f" [init -> test-ram_fs_chunk] allocator: sum=0 [init -> test-ram_fs_chunk] --- RAM filesystem chunk test finished --- - - + diff --git a/repos/os/recipes/pkg/test-read_only_rom/runtime b/repos/os/recipes/pkg/test-read_only_rom/runtime index 160c6af103..76d0c71cfd 100644 --- a/repos/os/recipes/pkg/test-read_only_rom/runtime +++ b/repos/os/recipes/pkg/test-read_only_rom/runtime @@ -1,9 +1,7 @@ - - - ROM dataspace modified - + + ROM dataspace modified diff --git a/repos/os/recipes/pkg/test-report_rom/runtime b/repos/os/recipes/pkg/test-report_rom/runtime index ce21c0f1c2..e3d980e501 100644 --- a/repos/os/recipes/pkg/test-report_rom/runtime +++ b/repos/os/recipes/pkg/test-report_rom/runtime @@ -2,10 +2,9 @@ - - - exited with exit value -1 - + + exited with exit value -1 + [init -> test-report_rom] --- test-report_rom started --- [init -> test-report_rom] Reporter: open session [init -> test-report_rom] Reporter: brightness 10 @@ -30,8 +29,7 @@ [init -> test-report_rom] ROM client: caught Service_denied - OK [init -> test-report_rom] --- test-report_rom finished --- [init] child "test-report_rom" exited with exit value 0 - - + @@ -59,8 +57,7 @@ - + diff --git a/repos/os/recipes/pkg/test-resource_request/runtime b/repos/os/recipes/pkg/test-resource_request/runtime index 0e965e0cb7..7e57aff893 100644 --- a/repos/os/recipes/pkg/test-resource_request/runtime +++ b/repos/os/recipes/pkg/test-resource_request/runtime @@ -1,9 +1,7 @@ - - - child "test-resource_request" exited with exit value 0 - + + child "test-resource_request" exited with exit value 0 diff --git a/repos/os/recipes/pkg/test-resource_yield/runtime b/repos/os/recipes/pkg/test-resource_yield/runtime index 30bbcd3af9..5ec6964605 100644 --- a/repos/os/recipes/pkg/test-resource_yield/runtime +++ b/repos/os/recipes/pkg/test-resource_yield/runtime @@ -2,11 +2,9 @@ - - - --- test-resource_yield finished --- - Error: - + + --- test-resource_yield finished --- + Error: diff --git a/repos/os/recipes/pkg/test-rom_filter/runtime b/repos/os/recipes/pkg/test-rom_filter/runtime index ace93b41c8..99d862b468 100644 --- a/repos/os/recipes/pkg/test-rom_filter/runtime +++ b/repos/os/recipes/pkg/test-rom_filter/runtime @@ -2,9 +2,8 @@ - - - + + [init -> rom_logger] ROM 'generated': [init -> rom_logger] <config color="transparent"><!-- ... fallback ... --></config>* [init -> rom_logger] ROM 'generated': @@ -14,9 +13,8 @@ [init -> rom_logger] ROM 'generated': [init -> rom_logger] <config message="system locked" color="transparent"><!-- ... fallback ... --></config>* [init -> dynamic_rom] xray: change (finished) - - Error: - + + Error: @@ -48,17 +46,17 @@ - + - +