From c0e089af45a4e11334c9147bddeaadcb216bef53 Mon Sep 17 00:00:00 2001 From: Jonas Termansen Date: Tue, 5 Mar 2024 13:47:17 +0000 Subject: [PATCH] [infra] Fix environment during RBE shutdown. Bug: b/296994239 Change-Id: Id7545ef44a28ebb3c1439c1f980fa95978be1412 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/355780 Reviewed-by: William Hesse --- tools/build.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/build.py b/tools/build.py index 89a5d8a8880..89a5522e5b2 100755 --- a/tools/build.py +++ b/tools/build.py @@ -176,12 +176,12 @@ def StartRBE(out_dir, use_goma, env): return True -def StopRBE(): +def StopRBE(env): global rbe_started, bootstrap_path if rbe_started != 'rbe': return bootstrap_command = [bootstrap_path, '--shutdown'] - process = subprocess.Popen(bootstrap_command) + process = subprocess.Popen(bootstrap_command, env=env) process.wait() @@ -341,7 +341,7 @@ def Main(): exit_code = Build(configs, env, options) - StopRBE() + StopRBE(env) if exit_code == 0: endtime = time.time()