diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2021-07-21 13:44:19 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-07-23 05:55:05 +0000 |
| commit | b33bf2a78158c016ae952f00d9d85d690cfa3ad9 (patch) | |
| tree | 7c287eaa99542d74e5ffc21874482ce75a8da535 /test/kb_scan.c | |
| parent | 330293d53543cd9af5fbf85fb031f83a940b6d59 (diff) | |
| download | chrome-ec-b33bf2a78158c016ae952f00d9d85d690cfa3ad9.tar.gz | |
keyboard: Restore kb_scan test
kb_scan test was disabled due to crbug.com/976974. Since it's only
partially broken, this CL enables the test and disables
simulate_key_test.
BUG=b:152931654
BRANCH=None
TEST=make run-kb_scan
Change-Id: I9496f34a320c81b113c241d6160091721a28a5de
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3044404
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Diffstat (limited to 'test/kb_scan.c')
| -rw-r--r-- | test/kb_scan.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/test/kb_scan.c b/test/kb_scan.c index a4fb6f9841..8ca81cad18 100644 --- a/test/kb_scan.c +++ b/test/kb_scan.c @@ -99,6 +99,10 @@ void chipset_reset(void) KEYBOARD_COL_ ## k, \ p) +#define mock_default_key(k, p) mock_key(KEYBOARD_DEFAULT_ROW_ ## k, \ + KEYBOARD_DEFAULT_COL_ ## k, \ + p) + static void mock_key(int r, int c, int keydown) { ccprintf("%s (%d, %d)\n", keydown ? "Pressing" : "Releasing", r, c); @@ -330,21 +334,21 @@ static int runtime_key_test(void) { /* Alt-VolUp-H triggers system hibernation */ mock_defined_key(LEFT_ALT, 1); - mock_defined_key(VOL_UP, 1); + mock_default_key(VOL_UP, 1); mock_defined_key(KEY_H, 1); TEST_ASSERT(wait_variable_set(&hibernated) == EC_SUCCESS); mock_defined_key(LEFT_ALT, 0); - mock_defined_key(VOL_UP, 0); + mock_default_key(VOL_UP, 0); mock_defined_key(KEY_H, 0); TEST_ASSERT(expect_keychange() == EC_SUCCESS); /* Alt-VolUp-R triggers chipset reset */ mock_defined_key(RIGHT_ALT, 1); - mock_defined_key(VOL_UP, 1); + mock_default_key(VOL_UP, 1); mock_defined_key(KEY_R, 1); TEST_ASSERT(wait_variable_set(&reset_called) == EC_SUCCESS); mock_defined_key(RIGHT_ALT, 0); - mock_defined_key(VOL_UP, 0); + mock_default_key(VOL_UP, 0); mock_defined_key(KEY_R, 0); TEST_ASSERT(expect_keychange() == EC_SUCCESS); @@ -352,10 +356,10 @@ static int runtime_key_test(void) mock_defined_key(LEFT_ALT, 1); mock_defined_key(KEY_H, 1); mock_defined_key(KEY_R, 1); - mock_defined_key(VOL_UP, 1); + mock_default_key(VOL_UP, 1); TEST_ASSERT(verify_variable_not_set(&hibernated) == EC_SUCCESS); TEST_ASSERT(verify_variable_not_set(&reset_called) == EC_SUCCESS); - mock_defined_key(VOL_UP, 0); + mock_default_key(VOL_UP, 0); mock_defined_key(KEY_R, 0); mock_defined_key(KEY_H, 0); mock_defined_key(LEFT_ALT, 0); @@ -408,7 +412,7 @@ void test_init(void) /* Power-F3-ESC */ system_set_reset_flags(system_get_reset_flags() | EC_RESET_FLAG_RESET_PIN); - mock_key(1, 1, 1); + mock_key(KEYBOARD_ROW_ESC, KEYBOARD_COL_ESC, 1); } else if (state & TEST_STATE_MASK(TEST_STATE_STEP_3)) { /* Power-F3-Down */ system_set_reset_flags(system_get_reset_flags() | @@ -424,8 +428,11 @@ static void run_test_step1(void) test_reset(); RUN_TEST(deghost_test); + RUN_TEST(debounce_test); - RUN_TEST(simulate_key_test); + + if (0) /* crbug.com/976974 */ + RUN_TEST(simulate_key_test); #ifdef EMU_BUILD RUN_TEST(runtime_key_test); #endif |