瀏覽代碼

autoninja: Propgate AUTONINJA_BUILD_ID to siso ninja via SISO_BUILD_ID

Bug: 355127782
Change-Id: Ia7f55696e9282c8719ca98892963bb991caa70f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5734819
Auto-Submit: Junji Watanabe <jwata@google.com>
Commit-Queue: Junji Watanabe <jwata@google.com>
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Commit-Queue: Fumitoshi Ukai <ukai@google.com>
Junji Watanabe 1 年之前
父節點
當前提交
670ce748be
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      autoninja.py

+ 4 - 2
autoninja.py

@@ -187,7 +187,7 @@ def _print_cmd(cmd):
     print(*[shell_quoter(arg) for arg in cmd], file=sys.stderr)
     print(*[shell_quoter(arg) for arg in cmd], file=sys.stderr)
 
 
 
 
-def _main_inner(input_args, should_collect_logs=False):
+def _main_inner(input_args, build_id, should_collect_logs=False):
     # if user doesn't set PYTHONPYCACHEPREFIX and PYTHONDONTWRITEBYTECODE
     # if user doesn't set PYTHONPYCACHEPREFIX and PYTHONDONTWRITEBYTECODE
     # set PYTHONDONTWRITEBYTECODE=1 not to create many *.pyc in workspace
     # set PYTHONDONTWRITEBYTECODE=1 not to create many *.pyc in workspace
     # and keep workspace clean.
     # and keep workspace clean.
@@ -277,6 +277,8 @@ def _main_inner(input_args, should_collect_logs=False):
                     file=sys.stderr,
                     file=sys.stderr,
                 )
                 )
                 return 1
                 return 1
+            # Build ID consistently used in other tools. e.g. Reclient, ninjalog.
+            os.environ.setdefault("SISO_BUILD_ID", build_id)
             if use_remoteexec:
             if use_remoteexec:
                 if use_reclient:
                 if use_reclient:
                     return reclient_helper.run_siso(
                     return reclient_helper.run_siso(
@@ -428,7 +430,7 @@ def main(args):
     if sys.platform.startswith("win") and len(args) == 2:
     if sys.platform.startswith("win") and len(args) == 2:
         input_args = args[:1] + args[1].split()
         input_args = args[:1] + args[1].split()
     try:
     try:
-        exit_code = _main_inner(input_args, should_collect_logs)
+        exit_code = _main_inner(input_args, build_id, should_collect_logs)
     except KeyboardInterrupt:
     except KeyboardInterrupt:
         exit_code = 1
         exit_code = 1
     finally:
     finally: