Commit a4844117 authored by pasthana's avatar pasthana Committed by Commit Bot

Invoke update.py as a subprocess in coverage.py

Currently coverage.py is using update.py as a module which is not guaranteed

Bug: 1075586
Change-Id: Ia4c54413bfd63adc412fd665af26ac0b228f3e30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210175
Auto-Submit: Prakhar Asthana <pasthana@google.com>
Commit-Queue: Yuke Liao <liaoyuke@chromium.org>
Reviewed-by: default avatarYuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771111}
parent 6058ef30
...@@ -157,7 +157,8 @@ def _ConfigureLLVMCoverageTools(args): ...@@ -157,7 +157,8 @@ def _ConfigureLLVMCoverageTools(args):
LLVM_COV_PATH = os.path.join(llvm_bin_dir, 'llvm-cov') LLVM_COV_PATH = os.path.join(llvm_bin_dir, 'llvm-cov')
LLVM_PROFDATA_PATH = os.path.join(llvm_bin_dir, 'llvm-profdata') LLVM_PROFDATA_PATH = os.path.join(llvm_bin_dir, 'llvm-profdata')
else: else:
update.UpdatePackage('coverage_tools', coverage_utils.GetHostPlatform()) subprocess.check_call(
['tools/clang/scripts/update.py', '--package', 'coverage_tools'])
if coverage_utils.GetHostPlatform() == 'win': if coverage_utils.GetHostPlatform() == 'win':
LLVM_COV_PATH += '.exe' LLVM_COV_PATH += '.exe'
...@@ -948,12 +949,6 @@ def _ParseCommandArguments(): ...@@ -948,12 +949,6 @@ def _ParseCommandArguments():
def Main(): def Main():
"""Execute tool commands.""" """Execute tool commands."""
# Setup coverage binaries even when script is called with empty params. This
# is used by coverage bot for initial setup.
if len(sys.argv) == 1:
update.UpdatePackage('coverage_tools', coverage_utils.GetHostPlatform())
print(__doc__)
return
# Change directory to source root to aid in relative paths calculations. # Change directory to source root to aid in relative paths calculations.
global SRC_ROOT_PATH global SRC_ROOT_PATH
...@@ -961,6 +956,14 @@ def Main(): ...@@ -961,6 +956,14 @@ def Main():
os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir)) os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir))
os.chdir(SRC_ROOT_PATH) os.chdir(SRC_ROOT_PATH)
# Setup coverage binaries even when script is called with empty params. This
# is used by coverage bot for initial setup.
if len(sys.argv) == 1:
subprocess.check_call(
['tools/clang/scripts/update.py', '--package', 'coverage_tools'])
print(__doc__)
return
args = _ParseCommandArguments() args = _ParseCommandArguments()
coverage_utils.ConfigureLogging(verbose=args.verbose, log_file=args.log_file) coverage_utils.ConfigureLogging(verbose=args.verbose, log_file=args.log_file)
_ConfigureLLVMCoverageTools(args) _ConfigureLLVMCoverageTools(args)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment