os: adjust tests to changed output of block client

issue #3671
This commit is contained in:
Sebastian Sumpf 2020-03-09 08:21:21 +01:00 committed by Norman Feske
parent f5a6d85bc2
commit a799a5f978
5 changed files with 9 additions and 9 deletions

View File

@ -4,7 +4,7 @@
<events>
<timeout meaning="failed" sec="20" />
<log meaning="succeeded">Tests finished successfully</log>
<log meaning="succeeded">--- all tests finished ---</log>
<log meaning="failed">test-block-client] Error: </log>
</events>

View File

@ -4,7 +4,7 @@
<events>
<timeout meaning="failed" sec="20" />
<log meaning="succeeded">Tests finished successfully</log>
<log meaning="succeeded">--- all tests finished ---</log>
<log meaning="failed">test-block-client] Error: </log>
</events>

View File

@ -5,8 +5,8 @@
<events>
<timeout meaning="failed" sec="70" />
<log meaning="succeeded">
Tests finished successfully!*
Tests finished successfully!
--- all tests finished ---*
--- all tests finished ---
</log>
<log meaning="failed">Error: </log>
</events>

View File

@ -5,9 +5,9 @@
<events>
<timeout meaning="failed" sec="60" />
<log meaning="succeeded">
Tests finished successfully!*
Tests finished successfully!*
Tests finished successfully!
--- all tests finished ---*
--- all tests finished ---*
--- all tests finished ---
</log>
<log meaning="failed">Error: </log>
</events>

View File

@ -107,7 +107,7 @@ append qemu_args " -nographic -device ahci,id=ahci -boot d "
append qemu_args " -drive id=disk,file=bin/ext2.raw,format=raw,if=none -device ide-hd,drive=disk,bus=ahci.0 "
append qemu_args " -drive id=cd,file=[run_dir]/../ahci_block.iso,if=none,media=cdrom -device ide-cd,drive=cd,bus=ahci.1 "
run_genode_until "Tests finished successfully!" 100
run_genode_until "Tests finished successfully!" 100 [output_spawn_id]
run_genode_until "--- all tests finished ---" 100
run_genode_until "--- all tests finished ---" 100 [output_spawn_id]
exec rm -f bin/ext2.raw