diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2022-08-05 15:58:49 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-05 17:21:41 +0000 |
| commit | ab36e4ff4322b9c3bcdb59ecaf19e055b1365545 (patch) | |
| tree | b44de7845c0e9d0a096359f403fe9c560fad6c79 /util | |
| parent | 8c95f2bd1e4ec646ca5c39fe625c5e9701b4245a (diff) | |
| download | chrome-ec-ab36e4ff4322b9c3bcdb59ecaf19e055b1365545.tar.gz | |
Revert "zephyr: Make ZEPHYR_BASE not an environment variable"
This reverts commit d16be8f98d81d7e589935d1c6c78ec4430a8960d.
Reason for revert: suspected at fault for b/241489955
(suspect we're stripping ccache environment variables in ninja call)
BUG=b:241489955
TEST=CQ
Original change's description:
> zephyr: Make ZEPHYR_BASE not an environment variable
>
> To minimize the amount of environment variable dependency we have, move
> ZEPHYR_BASE (used to find the "Zephyr" CMake package) from an
> environment variable to a CMake definition.
>
> This makes our only required environment variable PATH, so we can do a
> complete environment scrub for all commands executed.
>
> BUG=b:239619222
> BRANCH=none
> TEST=zmake testall
>
> Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
> Change-Id: Ie34a9e1f49177649cf0e54c95d73b41bd1b94992
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3811715
> Reviewed-by: Abe Levkoy <alevkoy@chromium.org>
Bug: b:239619222
Change-Id: I9cfdb04fc61d013ba670049c5dbbeeca7de4893c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3813042
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Commit-Queue: Jeremy Bettis <jbettis@chromium.org>
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
Tested-by: Bob Moragues <moragues@chromium.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/twister_launcher.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/twister_launcher.py b/util/twister_launcher.py index a78a0dd534..cd21b1e39e 100755 --- a/util/twister_launcher.py +++ b/util/twister_launcher.py @@ -72,6 +72,7 @@ def main(): twister_env = dict(os.environ) twister_env.update( { + "ZEPHYR_BASE": str(zephyr_base), "TOOLCHAIN_ROOT": str(ec_base / "zephyr"), "ZEPHYR_TOOLCHAIN_VARIANT": "llvm", } @@ -83,7 +84,6 @@ def main(): "--ninja", f"-x=DTS_ROOT={str( ec_base / 'zephyr')}", f"-x=SYSCALL_INCLUDE_DIRS={str(ec_base / 'zephyr' / 'include' / 'drivers')}", - f"-x=ZEPHYR_BASE={zephyr_base}", f"-x=ZEPHYR_MODULES={';'.join([str(p) for p in zephyr_modules])}", "--gcov-tool", ec_base / "util" / "llvm-gcov.sh", |