From ede009edf9f9877ee07295abe5337bb86d7041b6 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Mon, 9 Sep 2019 11:35:42 +0200 Subject: [PATCH] Fix expected output in USB HID tests Invalid characters in press events are no longer 0 but 0xfffe since a97b8043b5 utf8: non-character U+fffe as invalid codepoint Issue #3483 --- repos/dde_linux/run/usb_hid.run | 8 ++++---- repos/dde_linux/run/usb_hid_raw.run | 8 ++++---- repos/ports/run/vbox5_genode_usb_hid.run | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/repos/dde_linux/run/usb_hid.run b/repos/dde_linux/run/usb_hid.run index 9006c202a..3021bb07d 100644 --- a/repos/dde_linux/run/usb_hid.run +++ b/repos/dde_linux/run/usb_hid.run @@ -227,9 +227,9 @@ filter_out_color_escape_sequences trim_lines compare_output_to { -[init -> test-input] Input event #0 PRESS KEY_X 0 +[init -> test-input] Input event #0 PRESS KEY_X 65534 [init -> test-input] Input event #1 RELEASE KEY_X -[init -> test-input] Input event #2 PRESS BTN_LEFT 0 +[init -> test-input] Input event #2 PRESS BTN_LEFT 65534 [init -> test-input] Input event #3 REL_MOTION -1+0 [init -> test-input] Input event #4 REL_MOTION +0+1 [init -> test-input] Input event #5 RELEASE BTN_LEFT @@ -239,9 +239,9 @@ compare_output_to { [init -> usb_drv] dev_info: input: USB HID v1.11 Keyboard [D L] [init -> usb_drv] dev_info: D L [init -> usb_drv] dev_info: input: USB HID v1.11 Mouse [D L] -[init -> test-input] Input event #6 PRESS KEY_X 0 +[init -> test-input] Input event #6 PRESS KEY_X 65534 [init -> test-input] Input event #7 RELEASE KEY_X -[init -> test-input] Input event #8 PRESS BTN_LEFT 0 +[init -> test-input] Input event #8 PRESS BTN_LEFT 65534 [init -> test-input] Input event #9 REL_MOTION -1+0 [init -> test-input] Input event #10 REL_MOTION +0+1 [init -> test-input] Input event #11 RELEASE BTN_LEFT diff --git a/repos/dde_linux/run/usb_hid_raw.run b/repos/dde_linux/run/usb_hid_raw.run index a42ce3af1..017200d09 100644 --- a/repos/dde_linux/run/usb_hid_raw.run +++ b/repos/dde_linux/run/usb_hid_raw.run @@ -235,9 +235,9 @@ filter_out_color_escape_sequences trim_lines compare_output_to { -[init -> test-input] Input event #0 PRESS KEY_X 0 +[init -> test-input] Input event #0 PRESS KEY_X 65534 [init -> test-input] Input event #1 RELEASE KEY_X -[init -> test-input] Input event #2 PRESS BTN_LEFT 0 +[init -> test-input] Input event #2 PRESS BTN_LEFT 65534 [init -> test-input] Input event #3 REL_MOTION -1+0 [init -> test-input] Input event #4 REL_MOTION +0+1 [init -> test-input] Input event #5 RELEASE BTN_LEFT @@ -245,9 +245,9 @@ compare_output_to { [init -> usb_drv] dev_info: new full-speed USB device [init -> usb_hid_drv] dev_info: input: USB HID v1.11 Keyboard [HID 03eb:204d] [init -> usb_hid_drv] dev_info: input: USB HID v1.11 Mouse [HID 03eb:204d] -[init -> test-input] Input event #6 PRESS KEY_X 0 +[init -> test-input] Input event #6 PRESS KEY_X 65534 [init -> test-input] Input event #7 RELEASE KEY_X -[init -> test-input] Input event #8 PRESS BTN_LEFT 0 +[init -> test-input] Input event #8 PRESS BTN_LEFT 65534 [init -> test-input] Input event #9 REL_MOTION -1+0 [init -> test-input] Input event #10 REL_MOTION +0+1 [init -> test-input] Input event #11 RELEASE BTN_LEFT diff --git a/repos/ports/run/vbox5_genode_usb_hid.run b/repos/ports/run/vbox5_genode_usb_hid.run index 322774d24..658b1d758 100644 --- a/repos/ports/run/vbox5_genode_usb_hid.run +++ b/repos/ports/run/vbox5_genode_usb_hid.run @@ -289,9 +289,9 @@ filter_out_color_escape_sequences trim_lines compare_output_to { -[init -> log_terminal] [init -> test-input] Input event #0 PRESS KEY_X 0 +[init -> log_terminal] [init -> test-input] Input event #0 PRESS KEY_X 65534 [init -> log_terminal] [init -> test-input] Input event #1 RELEASE KEY_X -[init -> log_terminal] [init -> test-input] Input event #2 PRESS BTN_LEFT 0 +[init -> log_terminal] [init -> test-input] Input event #2 PRESS BTN_LEFT 65534 [init -> log_terminal] [init -> test-input] Input event #3 REL_MOTION -1+0 [init -> log_terminal] [init -> test-input] Input event #4 REL_MOTION +0+1 [init -> log_terminal] [init -> test-input] Input event #5 RELEASE BTN_LEFT @@ -304,9 +304,9 @@ compare_output_to { [init -> log_terminal] [init -> usb_drv] dev_info: input: USB HID v1.11 Keyboard [D L] [init -> log_terminal] [init -> usb_drv] dev_info: D L [init -> log_terminal] [init -> usb_drv] dev_info: input: USB HID v1.11 Mouse [D L] -[init -> log_terminal] [init -> test-input] Input event #6 PRESS KEY_X 0 +[init -> log_terminal] [init -> test-input] Input event #6 PRESS KEY_X 65534 [init -> log_terminal] [init -> test-input] Input event #7 RELEASE KEY_X -[init -> log_terminal] [init -> test-input] Input event #8 PRESS BTN_LEFT 0 +[init -> log_terminal] [init -> test-input] Input event #8 PRESS BTN_LEFT 65534 [init -> log_terminal] [init -> test-input] Input event #9 REL_MOTION -1+0 [init -> log_terminal] [init -> test-input] Input event #10 REL_MOTION +0+1 [init -> log_terminal] [init -> test-input] Input event #11 RELEASE BTN_LEFT