diff options
| author | Jeremy Bettis <jbettis@google.com> | 2021-04-12 09:49:53 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-12 20:08:03 +0000 |
| commit | 196e749fc5e1c6c71fa426dafd7bd345ad3578c5 (patch) | |
| tree | 9e516bf74366f1037de64b6d773862ff7b8fe819 /zephyr/shim/include/shimmed_task_id.h | |
| parent | d86e4c7d7ebb16c79912b3ea500dd862cba8081f (diff) | |
| download | chrome-ec-196e749fc5e1c6c71fa426dafd7bd345ad3578c5.tar.gz | |
zephyr: Allow ztests to use shimmed tasks
There is no reason to prevent CONFIG_SHIMMED_TASKS and CONFIG_ZTEST from
being used together.
BUG=b:185118990
TEST=zmake testall
BRANCH=none
Signed-off-by: Jeremy Bettis <jbettis@google.com>
Change-Id: I024ef0faea14fa9ddc38c5ca688e8fa4448691c2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2821357
Tested-by: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Diffstat (limited to 'zephyr/shim/include/shimmed_task_id.h')
| -rw-r--r-- | zephyr/shim/include/shimmed_task_id.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/zephyr/shim/include/shimmed_task_id.h b/zephyr/shim/include/shimmed_task_id.h index a57252cd66..c25d8c731e 100644 --- a/zephyr/shim/include/shimmed_task_id.h +++ b/zephyr/shim/include/shimmed_task_id.h @@ -14,10 +14,10 @@ typedef uint8_t task_id_t; /* * Highest priority on bottom -- same as in platform/ec. List of CROS_EC_TASK * items. See CONFIG_TASK_LIST in platform/ec's config.h for more information. - * This will only automatically get generated if CONFIG_ZTEST is not defined. - * Unit tests must define their own tasks. + * For tests that want their own custom tasks, use CONFIG_HAS_TEST_TASKS and not + * CONFIG_SHIMMED_TASKS. */ -#ifndef CONFIG_ZTEST +#ifdef CONFIG_SHIMMED_TASKS #define CROS_EC_TASK_LIST \ COND_CODE_1(HAS_TASK_HOOKS, \ (CROS_EC_TASK(HOOKS, hook_task, 0, \ |