InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

autoninja: use pure python for ninjalog_uploader_wrapper.py

Browse Source 
I'll update to python3 separately.

Bug: b/177465438
Change-Id: Id204789f2d0854a796e5408597700d90dc8cd191
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2626863
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Yoshisato Yanagisawa <yyanagisawa@google.com>
Reviewed-by: Bruce Dawson <brucedawson@chromium.org>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>
This commit is contained in:
Takuto Ikuta
2021-01-14 08:57:35 +00:00
committed by LUCI CQ
parent 703f21e217
commit c603339365
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoninja
View File

@@ -24,12 +24,12 @@ if eval "$command"; then
fi
# Collect ninjalog from googler.
vpython "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
python "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
exit
fi
# Collect ninjalog from googler.
vpython "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
python "$(dirname -- "$0")/ninjalog_uploader_wrapper.py" --cmd $command
# Return an error code of 1 so that if a developer types:
# "autoninja chrome && chrome" then chrome won't run if the build fails.

4
autoninja.bat
View File

@@ -38,12 +38,12 @@ FOR /f "usebackq tokens=*" %%a in (`vpython %scriptdir%autoninja.py "%*"`) do ec
REM Use call to invoke vpython script here, because we use vpython via vpython.bat.
@if "%NINJA_SUMMARIZE_BUILD%" == "1" call vpython.bat %scriptdir%post_build_ninja_summary.py %*
@call vpython.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
@call python.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
exit /b
:buildfailure
@call vpython.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
@call python.bat %scriptdir%ninjalog_uploader_wrapper.py --cmdline %*
REM Return an error code of 1 so that if a developer types:
REM "autoninja chrome && chrome" then chrome won't run if the build fails.

2
ninjalog_uploader.py
View File

@@ -26,7 +26,7 @@ import subprocess
import sys
import time
import httplib2
from third_party import httplib2
# These build configs affect build performance a lot.
# TODO(https://crbug.com/900161): Add 'blink_symbol_level' and

2
ninjalog_uploader_wrapper.py
View File

@@ -1,4 +1,4 @@
#!/usr/bin/env vpython
#!/usr/bin/env python
# Copyright 2018 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.