diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 19:47:54 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-07 19:47:54 +0000 |
| commit | eeedb8fe191f4fa172a4e776e196ae48d3f5d3f3 (patch) | |
| tree | bd6da116e62a3803d035a62672986b7af2dfc403 /o3d | |
| parent | a3f11bdf0707abf7910847849554bdbfecfac833 (diff) | |
| download | chromium_src-eeedb8fe191f4fa172a4e776e196ae48d3f5d3f3.zip chromium_src-eeedb8fe191f4fa172a4e776e196ae48d3f5d3f3.tar.gz chromium_src-eeedb8fe191f4fa172a4e776e196ae48d3f5d3f3.tar.bz2 | |
Removed manual setting of iexplore.exe path on 64-bit Windows during
Selenium runs. The new version of Selenium interprets this as a
command to override the path to mshta.exe, which runs the Selenium
driver, but this driver does not run in iexplore.exe due to
limitations on IE's supported command line length. The current version
of Selenium seems to have solved the issue of running the tests within
64-bit IE; with this change O3D runs within Selenium on Vista 64, but
only with UAC off. Also updated dependencies for selenium_ie target to
ensure o3d_host.dll is built.
Review URL: http://codereview.chromium.org/165139
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/tests/build.scons | 1 | ||||
| -rw-r--r-- | o3d/tests/selenium/main.py | 16 |
2 files changed, 1 insertions, 16 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 706cefd..f37d5a7 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -640,6 +640,7 @@ def DeferSelenium(env): run_selenium_ie = run_env.Alias( 'selenium_ie', ['$ARTIFACTS_DIR/${LIBPREFIX}npo3dautoplugin$SHLIBSUFFIX', + '$ARTIFACTS_DIR/${LIBPREFIX}o3d_host$SHLIBSUFFIX', env.GetPublished('samples', 'asset_files')], # TODO: have a cleaner way to do this. [Delete('$ARTIFACTS_DIR/selenium/screenshots_ie'), diff --git a/o3d/tests/selenium/main.py b/o3d/tests/selenium/main.py index 9ae98db..b0a7bc0 100644 --- a/o3d/tests/selenium/main.py +++ b/o3d/tests/selenium/main.py @@ -400,22 +400,6 @@ class SeleniumSession(object): server_url += str(self.http_server.http_port) browser_path_with_space = FLAGS.browserpath - # TODO: This is a hack to figure out if we're on 64-bit - # Windows. If we are, then we have to run the 32-bit Internet - # Explorer so that our plugin will work (indeed, even Microsoft - # has even made it impossible to use 64-bit Internet Explorer as - # your default browser). We need to find a better way to - # determine if we're on 64-bit Windows, so that it will work on - # foreign machines (which don't use the strings below for "Program - # Files" and "Internet Explorer"). - if (not browser_path_with_space and - browser == "*iexplore"): - program_files_x86 = "C:\\Program Files (x86)" - if os.path.isdir(program_files_x86): - browser_path_with_space = os.path.join(program_files_x86, - "Internet Explorer", - "iexplore.exe") - if browser_path_with_space: browser_path_with_space = " " + browser_path_with_space self.session = selenium.selenium("localhost", |