Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1237)

Unified Diff: build/android/pylib/perf/test_runner.py

Issue 1571803002: [Android] Prepare build/android/ for catapult+devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@create-device-library-links
Patch Set: rebase Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/linker/setup.py ('k') | build/android/pylib/remote/device/appurify_sanitized.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/perf/test_runner.py
diff --git a/build/android/pylib/perf/test_runner.py b/build/android/pylib/perf/test_runner.py
index fde95edc2cff75910373bf306048a685221f452e..5482b268d47275e3eb338aff9149d5511c6c8f89 100644
--- a/build/android/pylib/perf/test_runner.py
+++ b/build/android/pylib/perf/test_runner.py
@@ -68,6 +68,7 @@ from devil.utils import cmd_helper
from pylib import constants
from pylib.base import base_test_result
from pylib.base import base_test_runner
+from pylib.constants import host_paths
# Regex for the master branch commit position.
@@ -86,7 +87,7 @@ def _GetChromiumRevision():
# pylint: enable=line-too-long
status, output = cmd_helper.GetCmdStatusAndOutput(
['git', 'log', '-n', '1', '--pretty=format:%H%n%B', 'HEAD'],
- constants.DIR_SOURCE_ROOT)
+ host_paths.DIR_SOURCE_ROOT)
revision = None
commit_pos = None
if not status:
@@ -372,9 +373,9 @@ class TestRunner(base_test_runner.BaseTestRunner):
# Just print a heart-beat so that the outer buildbot scripts won't timeout
# without response.
logfile = _HeartBeatLogger()
- cwd = os.path.abspath(constants.DIR_SOURCE_ROOT)
+ cwd = os.path.abspath(host_paths.DIR_SOURCE_ROOT)
if full_cmd.startswith('src/'):
- cwd = os.path.abspath(os.path.join(constants.DIR_SOURCE_ROOT, os.pardir))
+ cwd = os.path.abspath(os.path.join(host_paths.DIR_SOURCE_ROOT, os.pardir))
try:
exit_code, output = cmd_helper.GetCmdStatusAndOutputWithTimeout(
full_cmd, timeout, cwd=cwd, shell=True, logfile=logfile)
« no previous file with comments | « build/android/pylib/linker/setup.py ('k') | build/android/pylib/remote/device/appurify_sanitized.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698