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

Unified Diff: chrome/test/chromedriver/chrome_paths.py

Issue 2188323002: [chromedriver] Update chrome_paths to use GN build directory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/chromedriver/chrome_paths.py
diff --git a/chrome/test/chromedriver/chrome_paths.py b/chrome/test/chromedriver/chrome_paths.py
index 58c4d3ee1a80a80ce8e0f7275c3f89d773616fee..33133ec6bc8961a733039da14c9ed2e67e66ad27 100644
--- a/chrome/test/chromedriver/chrome_paths.py
+++ b/chrome/test/chromedriver/chrome_paths.py
@@ -23,15 +23,9 @@ def GetTestData():
def GetBuildDir(required_paths):
"""Returns the preferred build directory that contains given paths."""
- dirs = ['out', 'build', 'xcodebuild']
- rel_dirs = [os.path.join(x, 'Release') for x in dirs]
- debug_dirs = [os.path.join(x, 'Debug') for x in dirs]
- full_dirs = [os.path.join(GetSrc(), x) for x in rel_dirs + debug_dirs]
- for build_dir in full_dirs:
- for required_path in required_paths:
- if not os.path.exists(os.path.join(build_dir, required_path)):
- break
- else:
- return build_dir
- raise RuntimeError('Cannot find build directory containing ' +
- ', '.join(required_paths))
+ build_dir = os.path.join(GetSrc(), 'out', 'Default')
jbudorick 2016/07/28 19:16:10 I take it all the chromedriver bots are now genera
+ for required_path in required_paths:
+ if not os.path.exists(os.path.join(build_dir, required_path)):
+ raise RuntimeError('Cannot find build directory containing ' +
+ ', '.join(required_paths))
+ return build_dir
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698