diff options
| -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", |