diff options
| author | ChromeOS Developer <dparker@chromium.org> | 2014-02-05 18:12:32 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-02-07 04:13:26 +0000 |
| commit | cf68cf9546f3400a6d7f4d818df3e63638a9eb77 (patch) | |
| tree | d404837d66f04e5af7484de2eaf3e5a23eb56c68 | |
| parent | 10627870feec074b4241deca8b33494215fd7244 (diff) | |
| download | chrome-ec-cf68cf9546f3400a6d7f4d818df3e63638a9eb77.tar.gz | |
Run KEYPROTO task during the button unit test
Change 18baa15 made a call to keyboard keyboard_update_button
conditional on running the KEYPROTO task. This call is needed
for the button unit test.
This fixes a test breakage when running "make buildall"
BUG=None
BRANCH=ToT
TEST=Run "make buildall -j32" "make BOARD=glimmer tests -j32"
and "make BOARD=rambi tests -j32" successfully with a
"make clobber" in between.
Signed-off-by: Dave Parker <dparker@chromium.org>
Orig-Change-Id: I6f10577ffd189fee7081aa65cf5adb9075c95373
Reviewed-on: https://chromium-review.googlesource.com/185104
Tested-by: Dave Parker <dparker@chromium.org>
Reviewed-by: Vic Yang <victoryang@chromium.org>
Commit-Queue: Dave Parker <dparker@chromium.org>
(cherry picked from commit c267054850c4b296a364e975063c634f34d701e9)
Change-Id: I92932577e83561530ef288c6ede211fa809962f8
Reviewed-on: https://chromium-review.googlesource.com/185245
Tested-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Commit-Queue: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | test/button.tasklist | 5 | ||||
| -rw-r--r-- | test/test_config.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/test/button.tasklist b/test/button.tasklist index 26cfc53453..65314cd0b8 100644 --- a/test/button.tasklist +++ b/test/button.tasklist @@ -1,4 +1,4 @@ -/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved. +/* Copyright (c) 2014 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -14,4 +14,5 @@ * 'd' in an opaque parameter passed to the routine at startup * 's' is the stack size in bytes; must be a multiple of 8 */ -#define CONFIG_TEST_TASK_LIST /* No test task */ +#define CONFIG_TEST_TASK_LIST \ + TASK_TEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) diff --git a/test/test_config.h b/test/test_config.h index 336ab5443a..3fc11034bc 100644 --- a/test/test_config.h +++ b/test/test_config.h @@ -84,6 +84,7 @@ int board_discharge_on_ac(int enabled); #ifdef TEST_BUTTON #define CONFIG_BUTTON_COUNT 2 +#define CONFIG_KEYBOARD_PROTOCOL_8042 #endif #endif /* TEST_BUILD */ |