diff options
author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 18:28:20 +0000 |
---|---|---|
committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-08 18:28:20 +0000 |
commit | 19f6ea2445f731935707d3258414cb685300c613 (patch) | |
tree | 028a2bf7b9b3f24fa7984a8ddfd2e54397f8d98f /o3d/tests/selenium/selenium.gyp | |
parent | c774c953ba1a748254528c26d1e5e72ad8ccbf27 (diff) | |
download | chromium_src-19f6ea2445f731935707d3258414cb685300c613.zip chromium_src-19f6ea2445f731935707d3258414cb685300c613.tar.gz chromium_src-19f6ea2445f731935707d3258414cb685300c613.tar.bz2 |
This makes selenium in Firefox work on the Mac.
Review URL: http://codereview.chromium.org/201046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/selenium/selenium.gyp')
-rw-r--r-- | o3d/tests/selenium/selenium.gyp | 64 |
1 files changed, 58 insertions, 6 deletions
diff --git a/o3d/tests/selenium/selenium.gyp b/o3d/tests/selenium/selenium.gyp index b9aa09f..f89e8f7 100644 --- a/o3d/tests/selenium/selenium.gyp +++ b/o3d/tests/selenium/selenium.gyp @@ -76,10 +76,37 @@ 'python<(EXECUTABLE_SUFFIX)', 'o3d/tests/selenium/main.py', '<@(selenium_args)', + '--browserpath=<(browser_path)', '--browser=*firefox', '--screenshotsdir=<(PRODUCT_DIR)/tests/selenium/screenshots_firefox', ], }, + 'conditions': [ + ['OS=="win"', + { + 'variables': { + 'browser_path': '', + }, + } + ], + ['OS=="linux"', + { + 'variables': { + 'browser_path': '', + }, + }, + ], + ['OS=="mac"', + { + 'dependencies': [ + 'unpack_firefox', + ], + 'variables': { + 'browser_path': '<(PRODUCT_DIR)/selenium_firefox/Firefox.app/Contents/MacOS/firefox-bin', + }, + }, + ], + ], }, { 'target_name': 'selenium_chrome', @@ -99,26 +126,30 @@ 'python<(EXECUTABLE_SUFFIX)', 'main.py', '<@(selenium_args)', + '--browserpath=<(browser_path)', '--browser=*googlechrome', '--screenshotsdir=<(PRODUCT_DIR)/tests/selenium/screenshots_chrome', ], }, 'conditions': [ + ['OS=="win"', + { + 'variables': { + 'browser_path': '', + }, + } + ], ['OS=="linux"', { 'variables': { - 'selenium_args': [ - '--browserpath=/usr/bin/google-chrome', - ], + 'browser_path': '/usr/bin/google-chrome', }, }, ], ['OS=="mac"', { 'variables': { - 'selenium_args': [ - '--browserpath="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"', - ], + 'browser_path': 'mac_chrome.sh', }, }, ], @@ -139,6 +170,27 @@ { 'targets': [ { + 'target_name': 'unpack_firefox', + 'type': 'none', + 'actions': [ + { + 'action_name': 'unpack_firefox', + 'inputs': [ + '<(PRODUCT_DIR)/O3D.plugin', + ], + 'outputs': [ + '<(PRODUCT_DIR)/selenium_firefox', + ], + 'action': [ + 'python', + 'unpack_firefox.py', + '--plugin_path=<(PRODUCT_DIR)/O3D.plugin', + '--product_path=<(PRODUCT_DIR)', + ], + }, + ], + }, + { 'target_name': 'selenium_safari', 'type': 'none', 'dependencies': [ |