summaryrefslogtreecommitdiffstats
path: root/chrome/test/pyautolib/pyauto.py
diff options
context:
space:
mode:
authornirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 21:23:28 +0000
committernirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-25 21:23:28 +0000
commit3db541adc0141f5c754a3af9e7e49fbb4342b86b (patch)
tree75b8dd428c37fbe178e99bfb76db17fd77acea99 /chrome/test/pyautolib/pyauto.py
parentb55f078e46c672a91324c55a7bb885dab20ab345 (diff)
downloadchromium_src-3db541adc0141f5c754a3af9e7e49fbb4342b86b.zip
chromium_src-3db541adc0141f5c754a3af9e7e49fbb4342b86b.tar.gz
chromium_src-3db541adc0141f5c754a3af9e7e49fbb4342b86b.tar.bz2
Add an additional build dir to look for pyauto libs on win
The upcoming chromium pyauto bots build in src/build/Release. Add it to the list of locations where pyauto looks for binaries. BUG= TEST= Review URL: http://codereview.chromium.org/3963009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63785 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/pyautolib/pyauto.py')
-rw-r--r--chrome/test/pyautolib/pyauto.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py
index 8103795..02d342e 100644
--- a/chrome/test/pyautolib/pyauto.py
+++ b/chrome/test/pyautolib/pyauto.py
@@ -52,7 +52,9 @@ def _LocateBinDirs():
'darwin': [ os.path.join(chrome_src, 'xcodebuild', 'Debug'),
os.path.join(chrome_src, 'xcodebuild', 'Release')],
'win32': [ os.path.join(chrome_src, 'chrome', 'Debug'),
- os.path.join(chrome_src, 'chrome', 'Release')],
+ os.path.join(chrome_src, 'build', 'Debug'),
+ os.path.join(chrome_src, 'chrome', 'Release'),
+ os.path.join(chrome_src, 'build', 'Release')],
'cygwin': [ os.path.join(chrome_src, 'chrome', 'Debug'),
os.path.join(chrome_src, 'chrome', 'Release')],
}