[chromedriver] Use the chromedriver server when running run_py_tests.

chrome/test/chromedriver/run_all_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Runs all ChromeDriver end to end tests."""
 
 import optparse
 import os
 import sys
@@ skipping 18 matching lines @@
   path_cfg_file = 'C:\\tools\\bots_path.cfg'
   if not os.path.exists(path_cfg_file):
     print 'Failed to find file', path_cfg_file
   with open(path_cfg_file, 'r') as cfg:
     paths = cfg.read().split('\n')
   os.environ['PATH'] = os.pathsep.join(paths) + os.pathsep + os.environ['PATH']
 
 
 def _GenerateTestCommand(script, chromedriver, chrome=None,
                          chrome_version=None, android_package=None):
-  python = sys.executable
-  if util.IsMac():
-    # In Mac, chromedriver2.so is a 32-bit build, so run with 32-bit python.
-    # /usr/bin/python* are universal binaries, meaning they have multiple
-    # binaries in one file.
-    # To force to run with i386, there are two options:
-    # 1) run a versioned python (e.g., 2.6) and use arch -i386.
-    # 2) set VERSIONER_PYTHON_PREFER_32_BIT=yes and run unversioned python
-    os.environ['VERSIONER_PYTHON_PREFER_32_BIT'] = 'yes'
-    python = 'python'
   cmd = [
-      python,
+      sys.executable,
       os.path.join(_THIS_DIR, script),
       '--chromedriver=' + chromedriver,
   ]
   if chrome:
     cmd.append('--chrome=' + chrome)
   if chrome_version:
     cmd.append('--chrome-version=' + chrome_version)
 
   if android_package:
     cmd.append('--android-package=' + android_package)
@@ skipping 42 matching lines @@
       '', '--android-package',
       help='Application package name, if running tests on Android.')
   # Option 'chrome-version' is for desktop only.
   parser.add_option(
       '', '--chrome-version',
       help='Version of chrome, e.g., \'HEAD\', \'27\', or \'26\'.'
            'Default is to run tests against all of these versions.'
            'Notice: this option only applies to desktop.')
   options, _ = parser.parse_args()
 
-  chromedriver_map = {
-      'win': 'chromedriver2.dll',
-      'mac': 'chromedriver2.so',
-      'linux': 'libchromedriver2.so',
-  }
-  chromedriver_name = chromedriver_map[util.GetPlatformName()]
+  postfix = ''
+  if util.IsWindows():
+    postfix = '.exe'
+  cpp_tests_name = 'chromedriver2_tests' + postfix
+  server_name = 'chromedriver2_server' + postfix
 
-  if util.IsWindows():
-    cpp_tests_name = 'chromedriver2_tests.exe'
-    server_name = 'chromedriver2_server.exe'
-  else:
-    cpp_tests_name = 'chromedriver2_tests'
-    server_name = 'chromedriver2_server'
-
-  required_build_outputs = [chromedriver_name]
+  required_build_outputs = [server_name]
   if not options.android_package:
-    required_build_outputs += [cpp_tests_name, server_name]
+    required_build_outputs += [cpp_tests_name]
   build_dir = chrome_paths.GetBuildDir(required_build_outputs)
   print 'Using build outputs from', build_dir
 
-  chromedriver = os.path.join(build_dir, chromedriver_name)
   chromedriver_server = os.path.join(build_dir, server_name)
 
   if util.IsLinux():
     # Set LD_LIBRARY_PATH to enable successful loading of shared object files,
     # when chromedriver2.so is not a static build.
     _AppendEnvironmentPath('LD_LIBRARY_PATH', os.path.join(build_dir, 'lib'))
   elif util.IsWindows():
     # For Windows bots: add ant, java(jre) and the like to system path.
     _AddToolsToSystemPathForWindows()
 
   if options.android_package:
     os.environ['PATH'] += os.pathsep + os.path.join(_THIS_DIR, 'chrome')
-    code1 = RunPythonTests(chromedriver,
+    code1 = RunPythonTests(chromedriver_server,
                            android_package=options.android_package)
     code2 = RunJavaTests(chromedriver_server,
                          android_package=options.android_package)
     return code1 or code2
   else:
     latest_snapshot_revision = archive.GetLatestRevision(archive.Site.SNAPSHOT)
     versions = [
         ['HEAD', latest_snapshot_revision],
         ['28', archive.CHROME_28_REVISION],
         ['27', archive.CHROME_27_REVISION]
     ]
     code = 0
     for version in versions:
       if options.chrome_version and version[0] != options.chrome_version:
         continue
       download_site = archive.Site.CONTINUOUS
       version_name = version[0]
       if version_name == 'HEAD':
         version_name = version[1]
         download_site = archive.Site.SNAPSHOT
       chrome_path = archive.DownloadChrome(version[1],
                                            util.MakeTempDir(),
                                            download_site)
-      code1 = RunPythonTests(chromedriver, chrome=chrome_path,
+      code1 = RunPythonTests(chromedriver_server, chrome=chrome_path,
                              chrome_version=version[0],
                              chrome_version_name=version_name)
       code2 = RunJavaTests(chromedriver_server, chrome=chrome_path,
                            chrome_version=version[0],
                            chrome_version_name=version_name)
       code = code or code1 or code2
     cpp_tests = os.path.join(build_dir, cpp_tests_name)
     return RunCppTests(cpp_tests) or code
 
 
 if __name__ == '__main__':
   sys.exit(main())