Move the layout test scripts into a 'webkitpy' subdirectory in preparation...

webkit/tools/layout_tests/layout_package/platform_utils_win.py

Index: webkit/tools/layout_tests/layout_package/platform_utils_win.py
===================================================================
--- webkit/tools/layout_tests/layout_package/platform_utils_win.py	(revision 36724)
+++ webkit/tools/layout_tests/layout_package/platform_utils_win.py	(working copy)
@@ -1,184 +0,0 @@
-# Copyright (c) 2006-2009 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.
-
-"""This is the Linux implementation of the layout_package.platform_utils
-   package. This file should only be imported by that package."""
-
-import os
-import path_utils
-import subprocess
-import sys
-
-
-def PlatformName():
-    """Returns the name of the platform we're currently running on."""
-    # We're not ready for version-specific results yet. When we uncomment
-    # this, we also need to add it to the BaselineSearchPath()
-    return 'chromium-win' + PlatformVersion()
-
-
-def PlatformVersion():
-    """Returns the version string for the platform, e.g. '-vista' or
-    '-snowleopard'. If the platform does not distinguish between
-    minor versions, it returns ''."""
-    winver = sys.getwindowsversion()
-    if winver[0] == 6 and (winver[1] == 1):
-        return '-7'
-    if winver[0] == 6 and (winver[1] == 0):
-        return '-vista'
-    if winver[0] == 5 and (winver[1] == 1 or winver[1] == 2):
-        return '-xp'
-    return ''
-
-
-def GetNumCores():
-    """Returns the number of cores on the machine. For hyperthreaded machines,
-    this will be double the number of actual processors."""
-    return int(os.environ.get('NUMBER_OF_PROCESSORS', 1))
-
-
-def BaselinePath(platform=None):
-    """Returns the path relative to the top of the source tree for the
-    baselines for the specified platform version. If |platform| is None,
-    then the version currently in use is used."""
-    if platform is None:
-        platform = PlatformName()
-    return path_utils.PathFromBase('webkit', 'data', 'layout_tests',
-                                   'platform', platform, 'LayoutTests')
-
-
-def BaselineSearchPath(platform=None):
-    """Returns the list of directories to search for baselines/results, in
-    order of preference. Paths are relative to the top of the source tree."""
-    dirs = []
-    if platform is None:
-        platform = PlatformName()
-
-    if platform == 'chromium-win-xp':
-        dirs.append(BaselinePath(platform))
-    if platform in ('chromium-win-xp', 'chromium-win-vista'):
-        dirs.append(BaselinePath('chromium-win-vista'))
-    dirs.append(BaselinePath('chromium-win'))
-    dirs.append(path_utils.WebKitBaselinePath('win'))
-    dirs.append(path_utils.WebKitBaselinePath('mac'))
-    return dirs
-
-
-def WDiffPath():
-    """Path to the WDiff executable, whose binary is checked in on Win"""
-    return path_utils.PathFromBase('third_party', 'cygwin', 'bin', 'wdiff.exe')
-
-
-def ImageDiffPath(target):
-    """Return the platform-specific binary path for the image compare util.
-         We use this if we can't find the binary in the default location
-         in path_utils.
-
-    Args:
-      target: Build target mode (debug or release)
-    """
-    return _FindBinary(target, 'image_diff.exe')
-
-
-def LayoutTestHelperPath(target):
-    """Return the platform-specific binary path for the layout test helper.
-    We use this if we can't find the binary in the default location
-    in path_utils.
-
-    Args:
-      target: Build target mode (debug or release)
-    """
-    return _FindBinary(target, 'layout_test_helper.exe')
-
-
-def TestShellPath(target):
-    """Return the platform-specific binary path for our TestShell.
-       We use this if we can't find the binary in the default location
-       in path_utils.
-
-    Args:
-      target: Build target mode (debug or release)
-    """
-    return _FindBinary(target, 'test_shell.exe')
-
-
-def ApacheExecutablePath():
-    """Returns the executable path to start Apache"""
-    path = path_utils.PathFromBase('third_party', 'cygwin', "usr", "sbin")
-    # Don't return httpd.exe since we want to use this from cygwin.
-    return os.path.join(path, "httpd")
-
-
-def ApacheConfigFilePath():
-    """Returns the path to Apache config file"""
-    return path_utils.PathFromBase("third_party", "WebKit", "LayoutTests",
-        "http", "conf", "cygwin-httpd.conf")
-
-
-def LigHTTPdExecutablePath():
-    """Returns the executable path to start LigHTTPd"""
-    return path_utils.PathFromBase('third_party', 'lighttpd', 'win',
-                                   'LightTPD.exe')
-
-
-def LigHTTPdModulePath():
-    """Returns the library module path for LigHTTPd"""
-    return path_utils.PathFromBase('third_party', 'lighttpd', 'win', 'lib')
-
-
-def LigHTTPdPHPPath():
-    """Returns the PHP executable path for LigHTTPd"""
-    return path_utils.PathFromBase('third_party', 'lighttpd', 'win', 'php5',
-                                   'php-cgi.exe')
-
-
-def ShutDownHTTPServer(server_pid):
-    """Shut down the lighttpd web server. Blocks until it's fully shut down.
-
-    Args:
-      server_pid: The process ID of the running server.
-          Unused in this implementation of the method.
-    """
-    subprocess.Popen(('taskkill.exe', '/f', '/im', 'LightTPD.exe'),
-                     stdout=subprocess.PIPE,
-                     stderr=subprocess.PIPE).wait()
-    subprocess.Popen(('taskkill.exe', '/f', '/im', 'httpd.exe'),
-                     stdout=subprocess.PIPE,
-                     stderr=subprocess.PIPE).wait()
-
-
-def KillProcess(pid):
-    """Forcefully kill the process.
-
-    Args:
-      pid: The id of the process to be killed.
-    """
-    subprocess.call(('taskkill.exe', '/f', '/pid', str(pid)),
-                    stdout=subprocess.PIPE,
-                    stderr=subprocess.PIPE)
-
-
-def KillAllTestShells(self):
-    """Kills all instances of the test_shell binary currently running."""
-    subprocess.Popen(('taskkill.exe', '/f', '/im', 'test_shell.exe'),
-                     stdout=subprocess.PIPE,
-                     stderr=subprocess.PIPE).wait()
-
-#
-# Private helper functions.
-#
-
-
-def _FindBinary(target, binary):
-    """On Windows, we look for binaries that we compile in potentially
-    two places: src/webkit/$target (preferably, which we get if we
-    built using webkit_glue.gyp), or src/chrome/$target (if compiled some
-    other way)."""
-    try:
-        return path_utils.PathFromBase('webkit', target, binary)
-    except path_utils.PathNotFound:
-        try:
-            return path_utils.PathFromBase('chrome', target, binary)
-        except path_utils.PathNotFound:
-            return path_utils.PathFromBase('build', target, binary)