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

Unified Diff: tools/telemetry/telemetry/util/support_binaries.py

Issue 412553006: [telemetry] Add util.path module and util.path.FindInstalledWindowsApplication. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix unit test. Created 6 years, 5 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 | « tools/telemetry/telemetry/util/path_unittest.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/util/support_binaries.py
diff --git a/tools/telemetry/telemetry/util/support_binaries.py b/tools/telemetry/telemetry/util/support_binaries.py
index fe4f5e786d423225483880fc2f38c1be2f280dd6..400e3d90dcf701622e05b2ac872112d802ee6fe0 100644
--- a/tools/telemetry/telemetry/util/support_binaries.py
+++ b/tools/telemetry/telemetry/util/support_binaries.py
@@ -5,13 +5,13 @@
import os
from telemetry import decorators
-from telemetry.core import util
from telemetry.util import cloud_storage
+from telemetry.util import path
def _GetBinPath(binary_name, platform_name):
# TODO(tonyg): Add another nesting level for architecture_name.
- return os.path.join(util.GetTelemetryDir(), 'bin', platform_name, binary_name)
+ return os.path.join(path.GetTelemetryDir(), 'bin', platform_name, binary_name)
def _IsInCloudStorage(binary_name, platform_name):
@@ -23,11 +23,11 @@ def FindLocallyBuiltPath(binary_name):
"""Finds the most recently built |binary_name|."""
command = None
command_mtime = 0
- chrome_root = util.GetChromiumSrcDir()
+ chrome_root = path.GetChromiumSrcDir()
required_mode = os.X_OK
if binary_name.endswith('.apk'):
required_mode = os.R_OK
- for build_dir, build_type in util.GetBuildDirectories():
+ for build_dir, build_type in path.GetBuildDirectories():
candidate = os.path.join(chrome_root, build_dir, build_type, binary_name)
if os.path.isfile(candidate) and os.access(candidate, required_mode):
candidate_mtime = os.stat(candidate).st_mtime
« no previous file with comments | « tools/telemetry/telemetry/util/path_unittest.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698