Buildbot changes for running page_cycler_http on Mac

scripts/slave/runtest.py

 #!/usr/bin/python
 # Copyright (c) 2007-2008 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.
 
 """A tool to run a chrome test executable, used by the buildbot slaves.
 
   When this is run, the current directory (cwd) should be the outer build
   directory (e.g., chrome-release/build/).
 
@@ skipping 26 matching lines @@
   build_dir = os.path.normpath(os.path.abspath(options.build_dir))
   test_exe_path = os.path.join(build_dir, options.target, test_exe)
   if not os.path.exists(test_exe_path):
     pre = 'Unable to find %s\n' % test_exe_path
     build_dir = os.path.join(os.path.dirname(build_dir), 'xcodebuild')
     test_exe_path = os.path.join(build_dir, options.target, test_exe)
     if not os.path.exists(test_exe_path):
       msg = pre + 'Unable to find %s' % test_exe_path
       raise chromium_utils.PathNotFound(msg)
 
+  http_server = None
+  if options.document_root:
+    platform_util = google.platform_utils.PlatformUtility(build_dir)
+
+    # Name the output directory for the exe, without its path or suffix.
+    # e.g., chrome-release/httpd_logs/unit_tests/
+    test_exe_name = os.path.splitext(os.path.basename(test_exe_path))[0]
+    output_dir = os.path.join(slave_utils.SlaveBaseDir(build_dir),
+                              'httpd_logs',
+                              test_exe_name)
+
+    apache_config_dir = google.httpd_utils.ApacheConfigDir(build_dir)
+    httpd_conf_path = os.path.join(apache_config_dir, 'httpd2_mac.conf')
+    mime_types_path = os.path.join(apache_config_dir, 'mime.types')
+    document_root = os.path.abspath(options.document_root)
+
+    start_cmd = platform_util.GetStartHttpdCommand(output_dir,
+                                                   httpd_conf_path,
+                                                   mime_types_path,
+                                                   document_root)
+    stop_cmd = platform_util.GetStopHttpdCommand()
+    http_server = google.httpd_utils.ApacheHttpd(start_cmd, stop_cmd, [8000])
+    try:
+      http_server.StartServer()
+    except google.httpd_utils.HttpdNotStarted, e:
+      raise google.httpd_utils.HttpdNotStarted('%s. See log file in %s' %
+                                               (e, output_dir))
+
   command = [test_exe_path]
   command.extend(args[1:])
   result = chromium_utils.RunCommand(command)
 
+  if options.document_root:
+    http_server.StopServer()
+
   return result
 
 def main_linux(options, args):
   if len(args) < 1:
     raise chromium_utils.MissingArgument('Usage: %s' % USAGE)
 
   build_dir = os.path.normpath(os.path.abspath(options.build_dir))
   slave_name = slave_utils.SlaveBuildName(build_dir)
   slave_utils.StartVirtualX(slave_name)
 
@@ skipping 102 matching lines @@
                            help='Start a local httpd server using the given '
                                 'document root, relative to the current dir')
   option_parser.add_option('', '--total-shards', dest='total_shards',
                            default=None, type="int",
                            help='Number of shards to split this test into.')
   option_parser.add_option('', '--shard-index', dest='shard_index',
                            default=None, type="int",
                            help='Shard to run. Must be between 1 and '
                                 'total-shards.')
   options, args = option_parser.parse_args()
-  
+
   # Set the number of shards environement variables.
   if options.total_shards and options.shard_index:
     os.environ['GTEST_TOTAL_SHARDS'] = str(options.total_shards)
     os.environ['GTEST_SHARD_INDEX'] = str(options.shard_index - 1)
 
   if sys.platform.startswith('darwin'):
     sys.exit(main_mac(options, args))
   elif sys.platform == 'win32':
     sys.exit(main_win(options, args))
   elif sys.platform == 'linux2':
     sys.exit(main_linux(options, args))
   else:
     sys.stderr.write('Unknown sys.platform value %s\n' % repr(sys.platform))
     sys.exit(1)