diff options
| author | Aaron Massey <aaronmassey@google.com> | 2022-09-20 15:59:46 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-26 17:27:05 +0000 |
| commit | 252ae36cf8778637fcd8d940dca1cde187f21c74 (patch) | |
| tree | 929dec2301f1424ae3b16319f96985432a205e67 | |
| parent | 7c767a245f22898fb07211e2107dec05d89848d7 (diff) | |
| download | chrome-ec-252ae36cf8778637fcd8d940dca1cde187f21c74.tar.gz | |
usbc_ppc: Enable console logs for tests
The usbc_ppc common code originally disabled console logging as it
seemingly made the amtpon board fail. However, whatever reason this may
have been no longer seems to be the case.
Enable common code usbc_ppc console logs on tests.
BRANCH=none
BUG=b:247854991
TEST=twister --clobber -i -s zephyr/test/drivers/drivers.usbc_ppc
TEST=make tests BOARD=ampton -j
TEST=make runhosttests -j
Signed-off-by: Aaron Massey <aaronmassey@google.com>
Change-Id: I73a4208bbb6b4841a0ccb3dccf8aa97cd2e2fd67
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3908160
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Al Semjonovs <asemjonovs@google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | Makefile.toolchain | 1 | ||||
| -rw-r--r-- | common/usbc_ppc.c | 18 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index 67a97ec1f7..0a82922a3e 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -118,6 +118,7 @@ CFLAGS_DEBUG= -g CFLAGS_DEBUG+=$(CFLAGS_DEBUG_CHIP) CFLAGS_INCLUDE=$(foreach i,$(filter-out builtin, $(includes)),-I$(i) ) -I. CFLAGS_TEST=$(if $(TEST_BUILD),-DTEST_BUILD=$(EMPTY) \ + -DTEST_LEGACY_BUILD=$(EMPTY) \ -DTEST_TASKFILE=$(PROJECT).tasklist,) \ $(if $(CTS_MODULE), $(CFLAGS_CTS)) \ $(if $(EMU_BUILD),-DEMU_BUILD=$(EMPTY)) \ diff --git a/common/usbc_ppc.c b/common/usbc_ppc.c index bc626097f7..b859c06fe8 100644 --- a/common/usbc_ppc.c +++ b/common/usbc_ppc.c @@ -14,30 +14,34 @@ #include "usbc_ppc.h" #include "util.h" -#ifndef TEST_BUILD +#ifndef TEST_LEGACY_BUILD +/* + * We limit the CPRINTF/S invocations to all builds that are not + * legacy test builds because they dont build otherwise. + */ #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args) #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args) #else -#define CPRINTF(args...) -#define CPRINTS(args...) +#define CPRINTF(format, args...) +#define CPRINTS(format, args...) #endif int ppc_prints(const char *string, int port) { -#if defined(TEST_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) +#if defined(TEST_LEGACY_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) return 0; #else return CPRINTS("ppc p%d %s", port, string); -#endif /* defined(TEST_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) */ +#endif /* defined(TEST_LEGACY_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) */ } int ppc_err_prints(const char *string, int port, int error) { -#if defined(TEST_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) +#if defined(TEST_LEGACY_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) return 0; #else return CPRINTS("ppc p%d %s (%d)", port, string, error); -#endif /* defined(TEST_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) */ +#endif /* defined(TEST_LEGACY_BUILD) || !defined(CONFIG_USBC_PPC_LOGGING) */ } __overridable bool board_port_has_ppc(int port) |