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

Remove redundant block from coverage.py

It should have been removed as part of https://chromium-review.googlesource.com/c/chromium/src/+/2210175

Bug: 1075586
Change-Id: I3ca290d7f4e7e1e4893eda2f6951d058d6794435
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2214806
Commit-Queue: Prakhar Asthana <pasthana@google.com>
Auto-Submit: Prakhar Asthana <pasthana@google.com>
Reviewed-by: default avatarYuke Liao <liaoyuke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772650}
parent 8f57d6dd
...@@ -80,12 +80,6 @@ import shutil ...@@ -80,12 +80,6 @@ import shutil
import subprocess import subprocess
import urllib2 import urllib2
sys.path.append(
os.path.join(
os.path.dirname(__file__), os.path.pardir, os.path.pardir, 'tools',
'clang', 'scripts'))
import update
sys.path.append( sys.path.append(
os.path.join( os.path.join(
os.path.dirname(__file__), os.path.pardir, os.path.pardir, os.path.dirname(__file__), os.path.pardir, os.path.pardir,
...@@ -96,12 +90,15 @@ import coverage_utils ...@@ -96,12 +90,15 @@ import coverage_utils
# Absolute path to the code coverage tools binary. These paths can be # Absolute path to the code coverage tools binary. These paths can be
# overwritten by user specified coverage tool paths. # overwritten by user specified coverage tool paths.
LLVM_BIN_DIR = os.path.join(update.LLVM_BUILD_DIR, 'bin') # Absolute path to the root of the checkout.
SRC_ROOT_PATH = os.path.join(os.path.abspath(os.path.dirname(__file__)),
os.path.pardir, os.path.pardir)
LLVM_BIN_DIR = os.path.join(
os.path.join(SRC_ROOT_PATH, 'third_party', 'llvm-build', 'Release+Asserts'),
'bin')
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')
# Absolute path to the root of the checkout.
SRC_ROOT_PATH = None
# Build directory, the value is parsed from command line arguments. # Build directory, the value is parsed from command line arguments.
BUILD_DIR = None BUILD_DIR = None
...@@ -951,9 +948,6 @@ def Main(): ...@@ -951,9 +948,6 @@ def Main():
"""Execute tool commands.""" """Execute tool commands."""
# 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
SRC_ROOT_PATH = coverage_utils.GetFullPath(
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 # Setup coverage binaries even when script is called with empty params. This
......
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