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

Unified Diff: chrome/test/pyautolib/pyauto_paths.py

Issue 7790024: Look in out/ as well as xcodebuild/ for mac, in case the user is using the make build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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/pyautolib/pyauto_paths.py
diff --git a/chrome/test/pyautolib/pyauto_paths.py b/chrome/test/pyautolib/pyauto_paths.py
index 5b9bb1eefc6dbc124a9d5404b9ac7e5d6a944347..4c1732a3a02b7217a446690880aeedad7d3b646a 100644
--- a/chrome/test/pyautolib/pyauto_paths.py
+++ b/chrome/test/pyautolib/pyauto_paths.py
@@ -22,27 +22,20 @@ def GetThirdPartyDir():
def GetBuildDirs():
"""Returns list of possible build directories."""
- build_dirs = {
- 'linux2': [ os.path.join('out', 'Debug'),
- os.path.join('sconsbuild', 'Debug'),
- os.path.join('out', 'Release'),
- os.path.join('sconsbuild', 'Release')],
- 'linux3': [ os.path.join('out', 'Debug'),
- os.path.join('sconsbuild', 'Debug'),
- os.path.join('out', 'Release'),
- os.path.join('sconsbuild', 'Release')],
- 'darwin': [ os.path.join('xcodebuild', 'Debug'),
- os.path.join('xcodebuild', 'Release')],
- 'win32': [ os.path.join('chrome', 'Debug'),
- os.path.join('build', 'Debug'),
- os.path.join('chrome', 'Release'),
- os.path.join('build', 'Release')],
- 'cygwin': [ os.path.join('chrome', 'Debug'),
- os.path.join('chrome', 'Release')],
- }
+ # List of dirs that can contain a Debug/Release build.
+ outer_dirs = {
+ 'linux2': ['out', 'sconsbuild'],
+ 'linux3': ['out', 'sconsbuild'],
+ 'darwin': ['xcodebuild', 'out'],
Nirnimesh 2011/08/30 16:49:11 reverse the order? 'out', 'xcodebuild'
+ 'win32': ['chrome', 'build'],
+ 'cygwin': ['chrome'],
+ }.get(sys.platform, [])
src_dir = GetSourceDir()
- return map(lambda dir: os.path.join(src_dir, dir),
- build_dirs.get(sys.platform, []))
+ build_dirs = []
+ for dir in outer_dirs:
+ build_dirs += [os.path.join(src_dir, dir, 'Debug')]
+ build_dirs += [os.path.join(src_dir, dir, 'Release')]
+ return build_dirs
def GetChromeDriverExe():
« 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