diff options
| author | Tomasz Michalec <tm@semihalf.com> | 2022-03-01 11:53:37 +0100 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-03-04 14:59:19 +0000 |
| commit | bfd75ccd973e64a4ff432bdc82293239fa0b7dfb (patch) | |
| tree | 5dd3468c7ffccaf92dd3d590e0a9f71b17978af3 | |
| parent | 19e5098f4891f4fc3eadb1228c5954776bf05aa0 (diff) | |
| download | chrome-ec-bfd75ccd973e64a4ff432bdc82293239fa0b7dfb.tar.gz | |
zmake: Print logs from zephyr LOG MODULE in test
In Zephyr test drivers CONFIG_NATIVE_UART_0_ON_STDINOUT is enabled to
print UART0 content to stdout. Log modules created by
LOG_MODULE_REGISTER print to UART0 by default.
It is necessary to pipe stdin in zmake to make test to work with UART0
redirected to stdin/stdout.
BUG=none
BRANCH=none
TEST=zmake -D configure --test test-drivers
Signed-off-by: Tomasz Michalec <tm@semihalf.com>
Change-Id: I5e577beee036a33b9ab1dfe7a25bdef0edb05aac
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3497740
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Tomasz Michalec <tmichalec@google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Tomasz Michalec <tmichalec@google.com>
| -rw-r--r-- | zephyr/test/drivers/prj.conf | 3 | ||||
| -rw-r--r-- | zephyr/zmake/zmake/zmake.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/zephyr/test/drivers/prj.conf b/zephyr/test/drivers/prj.conf index c36bea7f1a..d0a86e2391 100644 --- a/zephyr/test/drivers/prj.conf +++ b/zephyr/test/drivers/prj.conf @@ -15,6 +15,9 @@ CONFIG_ZTEST_MOCKING=y CONFIG_ZTEST_NEW_API=y CONFIG_ZTEST_PARAMETER_COUNT=24 +# Print logs from Zephyr LOG_MODULE to stdout +CONFIG_NATIVE_UART_0_ON_STDINOUT=y + # Simulate 10 ticks per ms CONFIG_SYS_CLOCK_TICKS_PER_SEC=10000 CONFIG_TASKS_SET_TEST_RUNNER_TID_RULE=y diff --git a/zephyr/zmake/zmake/zmake.py b/zephyr/zmake/zmake/zmake.py index f7b51356bf..bd44081c4e 100644 --- a/zephyr/zmake/zmake/zmake.py +++ b/zephyr/zmake/zmake/zmake.py @@ -744,6 +744,7 @@ class Zmake: self.logger.info("Running tests in %s.", elf_file) proc = self.jobserver.popen( cmd, + stdin=subprocess.DEVNULL, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding="utf-8", |