From 6572e7d68bcebca5e9717f43111d68f6a3e35d14 Mon Sep 17 00:00:00 2001 From: Yuval Peress Date: Mon, 12 Sep 2022 21:18:55 -0600 Subject: 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 Change-Id: I6b83c403e0ed3eea8c7ffb8e201c64bf1390d7ec Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3893083 Reviewed-by: Tristan Honscheid Reviewed-by: Jack Rosenthal --- util/twister_launcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", -- cgit v1.2.1