Add support for Mac vs. Linux sky_server builds

sky/tools/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 48 matching lines @@
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.layout_package.bot_test_expectations import BotTestExpectationsFactory
 from webkitpy.layout_tests.models import test_run_results
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 from webkitpy.layout_tests.port import config as port_config
 from webkitpy.layout_tests.port import driver
 from webkitpy.layout_tests.port import server_process
 from webkitpy.layout_tests.port.factory import PortFactory
 from webkitpy.layout_tests.servers import apache_http
 from webkitpy.layout_tests.servers import pywebsocket
+from skypy.skyserver import SkyServer
 
 _log = logging.getLogger(__name__)
 
 
 # FIXME: This class should merge with WebKitPort now that Chromium behaves mostly like other webkit ports.
 class Port(object):
     """Abstract class for Port-specific hooks for the layout_test package."""
 
     # Subclasses override this. This should indicate the basic implementation
     # part of the port name, e.g., 'mac', 'win', 'gtk'; there is probably (?)
@@ skipping 1007 matching lines @@
 
     def requires_http_server(self):
         """Does the port require an HTTP server for running tests? This could
         be the case when the tests aren't run on the host platform."""
         return True
 
     def _dart_packages_root(self):
         return self._build_path('gen/dart-pkg/packages')
 
     def server_command_line(self):
-        path = (self._options.path_to_server or
-            self.path_from_chromium_base('out', 'downloads', 'sky_server'))
+        # TODO(eseidel): Shouldn't this just use skyserver.py?
+        path = (self._options.path_to_server or SkyServer.sky_server_path())
         return [
             path,
             '-t', self.get_option('configuration'),
             self.path_from_chromium_base(),
             '8000',
             self._dart_packages_root()
         ]
 
     def start_http_server(self, additional_dirs, number_of_drivers):
         """Start a web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a web server to be running."""
         assert not self._http_server, 'Already running an http server.'
-        subprocess.call(self.path_to_script('download_sky_server'))
         self._http_server = subprocess.Popen(self.server_command_line())
 
     def start_websocket_server(self):
         """Start a web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a websocket server to be running."""
         assert not self._websocket_server, 'Already running a websocket server.'
 
         server = pywebsocket.PyWebSocket(self, self.results_directory())
         server.start()
@@ skipping 655 matching lines @@
 
 class PhysicalTestSuite(object):
     def __init__(self, base, args):
         self.name = base
         self.base = base
         self.args = args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)