diff options
| author | Yuval Peress <peress@google.com> | 2022-09-12 21:18:55 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-09-14 18:00:01 +0000 |
| commit | 6572e7d68bcebca5e9717f43111d68f6a3e35d14 (patch) | |
| tree | ea1163ac0c2aa40d04370d6231cad21fa50397e0 | |
| parent | 956055e69279ac3051f6882a84c5646d8c571965 (diff) | |
| download | chrome-ec-6572e7d68bcebca5e9717f43111d68f6a3e35d14.tar.gz | |
twister: Update checking if in chroot
Check the cros_chroot_version file instead of the environment variable
as directed in chat.
BRANCH=none
BUG=b:246461298
TEST=twister -c -v
Signed-off-by: Yuval Peress <peress@google.com>
Change-Id: I6b83c403e0ed3eea8c7ffb8e201c64bf1390d7ec
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3893083
Reviewed-by: Tristan Honscheid <honscheid@google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -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 d2b172ea0d..1dc178a34d 100755 --- a/util/twister_launcher.py +++ b/util/twister_launcher.py @@ -149,7 +149,7 @@ def main(): # Prepare environment variables for export to Twister. Inherit the parent # process's environment, but set some default values if not already set. twister_env = dict(os.environ) - is_in_chroot = os.environ.get("CROS_WORKON_SRCROOT") is not None + is_in_chroot = Path("/etc/cros_chroot_version").is_file() extra_env_vars = { "TOOLCHAIN_ROOT": os.environ.get( "TOOLCHAIN_ROOT", |