ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 10:46:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

file_vault_config_report tests: fix for pistachio

Browse Source 
* relaxes the timing and reduces the test steps because pistachio is quite
  slow and would otherwise trigger problems with our easy approach of using a
  dynamic rom instead of a proper manager

* provide IO_PORT and IRQ session to timer driver

Ref #4819
This commit is contained in:
Martin Stein 2023-06-02 21:06:34 +02:00 committed by Norman Feske
parent 194af03fe9
commit 80b729703b
2 changed files with 26 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
repos/gems/recipes/pkg/test-file_vault_config_report/runtime
View File

@ -5,23 +5,13 @@
</requires> </requires>
<events> <events>
<timeout meaning="failed" sec="240" /> <timeout meaning="failed" sec="70" />
<log meaning="succeeded"> <log meaning="succeeded">
&lt;ui_report version="step_*" state="uninitialized"/>* &lt;ui_report version="step_*" state="uninitialized"/>*
&lt;ui_report version="step_*" state="initializing"/>* &lt;ui_report version="step_*" state="initializing"/>*
&lt;ui_report version="step_*" state="unlocked"/>* &lt;ui_report version="step_*" state="unlocked"/>*
&lt;ui_report version="step_*" state="locking"/>*
&lt;ui_report version="step_*" state="locked"/>* &lt;ui_report version="step_*" state="locked"/>*
&lt;ui_report version="step_*" state="unlocking"/>*
&lt;ui_report version="step_*" state="unlocked"/>* &lt;ui_report version="step_*" state="unlocked"/>*
&lt;ui_report version="step_*" state="locking"/>*
&lt;ui_report version="step_*" state="locked"/>*
&lt;ui_report version="step_*" state="unlocking"/>*
&lt;ui_report version="step_*" state="locked"/>*
&lt;ui_report version="step_*" state="unlocking"/>*
&lt;ui_report version="step_*" state="unlocked"/>*
&lt;ui_report version="step_*" state="locking"/>*
&lt;ui_report version="step_*" state="locked"/>
</log> </log>
</events> </events>
@ -57,7 +47,7 @@
<ui_config version="step_1_wait"/> <ui_config version="step_1_wait"/>
</inline> </inline>
<sleep milliseconds="5000"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_2_init" passphrase="abcdefgh" <ui_config version="step_2_init" passphrase="abcdefgh"
@ -65,70 +55,28 @@
journaling_buf_size="1M"/> journaling_buf_size="1M"/>
</inline> </inline>
<sleep milliseconds="5000"/> <sleep milliseconds="10000"/>
<inline> <inline>
<ui_config version="step_3_lock"/> <ui_config version="step_3_lock"/>
</inline> </inline>
<sleep milliseconds="500"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_4_unlock_fast" passphrase="abcdefgh"/> <ui_config version="step_4_bad_unlock" passphrase="00000001"/>
</inline> </inline>
<sleep milliseconds="5000"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_5_lock"/> <ui_config version="step_5_wait"/>
</inline> </inline>
<sleep milliseconds="5000"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_6_bad_unlock" passphrase="00000001"/> <ui_config version="step_6_unlock" passphrase="abcdefgh"/>
</inline>
<sleep milliseconds="500"/>
<inline>
<ui_config version="step_7_bad_unlock" passphrase="00000002"/>
</inline>
<sleep milliseconds="500"/>
<inline>
<ui_config version="step_8_bad_unlock" passphrase="00000003"/>
</inline>
<sleep milliseconds="500"/>
<inline>
<ui_config version="step_9_bad_unlock" passphrase="00000004"/>
</inline>
<sleep milliseconds="500"/>
<inline>
<ui_config version="step_10_bad_unlock" passphrase="00000005"/>
</inline>
<sleep milliseconds="5000"/>
<inline>
<ui_config version="step_11_wait"/>
</inline>
<sleep milliseconds="10000"/>
<inline>
<ui_config version="step_12_unlock" passphrase="abcdefgh"/>
</inline>
<sleep milliseconds="500"/>
<inline>
<ui_config version="step_13_lock_fast"/>
</inline> </inline>
<sleep milliseconds="600000"/> <sleep milliseconds="600000"/>

83
repos/gems/run/file_vault.inc
View File

@ -54,14 +54,17 @@ append config {
<service name="IO_PORT"/> <service name="IO_PORT"/>
</parent-provides> </parent-provides>
<start name="timer" caps="100"> <start name="timer" caps="200">
<resource name="RAM" quantum="1M"/> <resource name="RAM" quantum="1M"/>
<resource name="CPU" quantum="5"/>
<provides> <service name="Timer"/> </provides> <provides> <service name="Timer"/> </provides>
<route> <route>
<service name="PD"> <parent/> </service> <service name="PD"> <parent/> </service>
<service name="ROM"> <parent/> </service> <service name="ROM"> <parent/> </service>
<service name="LOG"> <parent/> </service> <service name="LOG"> <parent/> </service>
<service name="CPU"> <parent/> </service> <service name="CPU"> <parent/> </service>
<service name="IO_PORT"> <parent/> </service>
<service name="IRQ"> <parent/> </service>
</route> </route>
</start> </start>
} }
@ -171,7 +174,7 @@ append_if [ui_is config_and_report] config {
<ui_config version="step_1_wait"/> <ui_config version="step_1_wait"/>
</inline> </inline>
<sleep milliseconds="4000"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_2_init" passphrase="abcdefgh" <ui_config version="step_2_init" passphrase="abcdefgh"
@ -179,70 +182,28 @@ append_if [ui_is config_and_report] config {
journaling_buf_size="1M"/> journaling_buf_size="1M"/>
</inline> </inline>
<sleep milliseconds="4000"/> <sleep milliseconds="10000"/>
<inline> <inline>
<ui_config version="step_3_lock"/> <ui_config version="step_3_lock"/>
</inline> </inline>
<sleep milliseconds="400"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_4_unlock_fast" passphrase="abcdefgh"/> <ui_config version="step_4_bad_unlock" passphrase="00000001"/>
</inline> </inline>
<sleep milliseconds="4000"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_5_lock"/> <ui_config version="step_5_wait"/>
</inline> </inline>
<sleep milliseconds="4000"/> <sleep milliseconds="6000"/>
<inline> <inline>
<ui_config version="step_6_bad_unlock" passphrase="00000001"/> <ui_config version="step_6_unlock" passphrase="abcdefgh"/>
</inline>
<sleep milliseconds="400"/>
<inline>
<ui_config version="step_7_bad_unlock" passphrase="00000002"/>
</inline>
<sleep milliseconds="400"/>
<inline>
<ui_config version="step_8_bad_unlock" passphrase="00000003"/>
</inline>
<sleep milliseconds="400"/>
<inline>
<ui_config version="step_9_bad_unlock" passphrase="00000004"/>
</inline>
<sleep milliseconds="400"/>
<inline>
<ui_config version="step_10_bad_unlock" passphrase="00000005"/>
</inline>
<sleep milliseconds="4000"/>
<inline>
<ui_config version="step_11_wait"/>
</inline>
<sleep milliseconds="8000"/>
<inline>
<ui_config version="step_12_unlock" passphrase="abcdefgh"/>
</inline>
<sleep milliseconds="400"/>
<inline>
<ui_config version="step_13_lock_fast"/>
</inline> </inline>
<sleep milliseconds="600000"/> <sleep milliseconds="600000"/>
@ -445,19 +406,9 @@ if {[ui_is config_and_report]} {
append exp_output {.*<ui_report version=\"step_.*\" state=\"uninitialized\"/>.*\n} append exp_output {.*<ui_report version=\"step_.*\" state=\"uninitialized\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"initializing\"/>.*\n} append exp_output {.*<ui_report version=\"step_.*\" state=\"initializing\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocked\"/>.*\n} append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocked\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"locking\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"locked\"/>.*\n} append exp_output {.*<ui_report version=\"step_.*\" state=\"locked\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocking\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocked\"/>.*\n} append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocked\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"locking\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"locked\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocking\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"locked\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocking\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"unlocked\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"locking\"/>.*\n}
append exp_output {.*<ui_report version=\"step_.*\" state=\"locked\"/>.*\n}
append qemu_args " -display none " append qemu_args " -display none "
run_genode_until $exp_output 120 run_genode_until $exp_output 70
} }