simplify interactive USB HID test metric

To circumvent recurring false-positives whenever things
in the USB drivers or its environment changes, limit
the checks to the event listener itself.
This commit is contained in:
Stefan Kalkowski 2024-07-30 16:52:49 +02:00 committed by Christian Helmuth
parent f283c2e7b2
commit e5c0d5247e
2 changed files with 5 additions and 60 deletions

View File

@ -206,28 +206,10 @@ if { [have_include "power_on/qemu"] || ![get_cmd_switch --autopilot] } { run_gen
# autopilot test
run_genode_until {\[init -\> event_dump\] Input event #0\t} 60
# remove everything before the first interesting line
regexp {(\[init -\> event_dump\] Input event #0\t.*)} $output all output
run_genode_until {\[init -\> event_dump\] Input event #11.*\n} 40 [output_spawn_id]
run_genode_until {\[init -\> event_dump\] Input event #11.*\n} 100
# pay only attention to the output of init and its children
grep_output {^\[init }
# filter out KVM switch messages during the nightly test
unify_output {(?n).*0557:2213.*} ""
unify_output {(?n) on usb-usbbus.*$} ""
unify_output {(?n) at usb-usbbus.*\)} ")"
unify_output {(?n)hid-generic.*input:} "hid-generic: input:"
unify_output {(?n)usb-[0-9]-[0-9]: USB disconnect, device number [0-9]} "usb-X-X: USB disconnect, device number X"
unify_output {(?n)input[0-9]} "inputX"
unify_output {(?n) as /devices/.*} ""
unify_output {(?n)^\[init -\> usb -\>.*} ""
unify_output {(?n)^\[init -\> usb_hid\] Connected device: inputX \(ATEN CS1764A V1.1.110\).*} ""
trim_lines
grep_output {^\[init -\> event_dump\]}
compare_output_to {
[init -> event_dump] Input event #0 PRESS KEY_X 65534 key count: 1
@ -235,15 +217,6 @@ compare_output_to {
[init -> event_dump] Input event #2 REL_MOTION -1+1 key count: 0
[init -> event_dump] Input event #3 PRESS BTN_LEFT 65534 key count: 1
[init -> event_dump] Input event #4 RELEASE BTN_LEFT key count: 0
[init -> usb_hid] usb usb-X-X: USB disconnect, device number X
[init -> usb_hid] Disconnected device: inputX
[init -> usb_hid] Disconnected device: inputX
[init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo
[init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo)
[init -> usb_hid] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo]
[init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo
[init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE
[init -> usb_hid] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo]
[init -> event_dump] Input event #5 PRESS KEY_X 65534 key count: 1
[init -> event_dump] Input event #6 RELEASE KEY_X key count: 0
[init -> event_dump] Input event #7 REL_MOTION -1+1 key count: 0

View File

@ -217,29 +217,10 @@ if { ![get_cmd_switch --autopilot] } { run_genode_until forever }
# autopilot test
run_genode_until {\[init -\> log_terminal\] \[init -\> event_dump\] Input event #0\t} 90
run_genode_until {\[init -\> log_terminal\] \[init -\> event_dump\] Input event #11\t} 150
# remove everything before the first interesting line
regexp {(\[init -\> log_terminal\] \[init -\> event_dump\] Input event #0\t.*)} $output all output
run_genode_until {.*\[init -\> event_dump\] Input event #11.*\n} 60 [output_spawn_id]
# pay only attention to the output of init and its children
grep_output {^\[init }
unify_output {(?n)^\[init -\> log_terminal\] \[init -\> usb_hid\] usb usb-[0-9]-[0-9]: input irq status -19 received} ""
unify_output {(?n) on usb-usbbus.*$} ""
unify_output {(?n) at usb-usbbus.*\)} ")"
unify_output {(?n)hid-generic.*input:} "hid-generic: input:"
unify_output {(?n)usb-[0-9]-[0-9]: USB disconnect, device number [0-9]} "usb-X-X: USB disconnect, device number X"
unify_output {(?n)device number [0-9]+} "device number X"
unify_output {(?n)input[0-9]} "inputX"
unify_output {(?n) as /devices/.*} ""
unify_output {(?n)^\[init -\> usb.*} ""
unify_output {(?n)^\[init -\> log_terminal\] \[init -\> usb.*} ""
unify_output {(?n)^.*dangling allocation.*$} ""
unify_output {(?n)^.*usbfs: process .* did not claim interface.*$} ""
trim_lines
# pay only attention to the output of event_dump
grep_output {^\[init -\> log_terminal\] \[init -\> event_dump\]}
compare_output_to {
[init -> log_terminal] [init -> event_dump] Input event #0 PRESS KEY_X 65534 key count: 1
@ -247,15 +228,6 @@ compare_output_to {
[init -> log_terminal] [init -> event_dump] Input event #2 REL_MOTION -1+1 key count: 0
[init -> log_terminal] [init -> event_dump] Input event #3 PRESS BTN_LEFT 65534 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #4 RELEASE BTN_LEFT key count: 0
[init -> log_terminal] [init -> usb_hid] usb usb-X-X: USB disconnect, device number X
[init -> log_terminal] [init -> usb_hid] Disconnected device: inputX
[init -> log_terminal] [init -> usb_hid] Disconnected device: inputX
[init -> log_terminal] [init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo
[init -> log_terminal] [init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo)
[init -> log_terminal] [init -> usb_hid] hid-generic: input: USB HID v1.11 Keyboard [Dean Camera LUFA Mouse and Keyboard Demo]
[init -> log_terminal] [init -> usb_hid] input: Dean Camera LUFA Mouse and Keyboard Demo
[init -> log_terminal] [init -> usb_hid] Connected device: inputX (Dean Camera LUFA Mouse and Keyboard Demo) MOUSE
[init -> log_terminal] [init -> usb_hid] hid-generic: input: USB HID v1.11 Mouse [Dean Camera LUFA Mouse and Keyboard Demo]
[init -> log_terminal] [init -> event_dump] Input event #5 PRESS KEY_X 65534 key count: 1
[init -> log_terminal] [init -> event_dump] Input event #6 RELEASE KEY_X key count: 0
[init -> log_terminal] [init -> event_dump] Input event #7 REL_MOTION -1+1 key count: 0