Remove all support for cygwin in run-webkit-tests.

third_party/WebKit/Tools/Scripts/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 27 matching lines @@
 import json
 import logging
 import optparse
 import re
 import sys
 
 from webkitpy.common import find_files
 from webkitpy.common import read_checksum_from_png
 from webkitpy.common.memoized import memoized
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.common.system.path import cygpath, abspath_to_uri
+from webkitpy.common.system.path import abspath_to_uri
 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.models.test_expectations import SKIP
 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
@@ skipping 373 matching lines @@
         tempdir = self._filesystem.mkdtemp()
 
         expected_filename = self._filesystem.join(str(tempdir), 'expected.png')
         self._filesystem.write_binary_file(expected_filename, expected_contents)
 
         actual_filename = self._filesystem.join(str(tempdir), 'actual.png')
         self._filesystem.write_binary_file(actual_filename, actual_contents)
 
         diff_filename = self._filesystem.join(str(tempdir), 'diff.png')
 
-        # image_diff needs native win paths as arguments, so we need to convert them if running under cygwin.
-        native_expected_filename = self._convert_path(expected_filename)
-        native_actual_filename = self._convert_path(actual_filename)
-        native_diff_filename = self._convert_path(diff_filename)
-
         executable = self._path_to_image_diff()
         # Although we are handed 'old', 'new', image_diff wants 'new', 'old'.
-        command = [executable, '--diff', native_actual_filename, native_expected_filename, native_diff_filename]
+        command = [executable, '--diff', actual_filename, expected_filename, diff_filename]
 
         result = None
         err_str = None
         try:
             exit_code = self._executive.run_command(command, return_exit_code=True)
             if exit_code == 0:
                 # The images are the same.
                 result = None
             elif exit_code == 1:
-                result = self._filesystem.read_binary_file(native_diff_filename)
+                result = self._filesystem.read_binary_file(diff_filename)
             else:
                 err_str = 'Image diff returned an exit code of %s. See http://crbug.com/278596' % exit_code
         except OSError as error:
             err_str = 'error running image diff: %s' % error
         finally:
             self._filesystem.rmtree(str(tempdir))
 
         return (result, err_str or None)
 
     def driver_name(self):
@@ skipping 615 matching lines @@
         if self.host.platform.is_mac():
             clean_env['DYLD_LIBRARY_PATH'] = self._build_path()
             variables_to_copy += [
                 'HOME',
             ]
         if self.host.platform.is_win():
             variables_to_copy += [
                 'PATH',
                 'GYP_DEFINES',  # Required to locate win sdk.
             ]
-        if self.host.platform.is_cygwin():
-            variables_to_copy += [
-                'HOMEDRIVE',
-                'HOMEPATH',
-                '_NT_SYMBOL_PATH',
-            ]
 
         for variable in variables_to_copy:
             if variable in self.host.environ:
                 clean_env[variable] = self.host.environ[variable]
 
         for string_variable in self.get_option('additional_env_var', []):
             [name, value] = string_variable.split('=', 1)
             clean_env[name] = value
 
         return clean_env
@@ skipping 57 matching lines @@
         server.start()
         self._wpt_server = server
 
     def stop_wptserve(self):
         """Shuts down the WPT server if it is running."""
         if self._wpt_server:
             self._wpt_server.stop()
             self._wpt_server = None
 
     def http_server_supports_ipv6(self):
-        # Apache < 2.4 on win32 does not support IPv6, nor does cygwin apache.
-        if self.host.platform.is_cygwin() or self.host.platform.is_win():
-            return False
-        return True
+        # Apache < 2.4 on win32 does not support IPv6.
+        return not self.host.platform.is_win()
 
     def stop_http_server(self):
         """Shuts down the http server if it is running."""
         if self._http_server:
             self._http_server.stop()
             self._http_server = None
 
     def stop_websocket_server(self):
         """Shuts down the websocket server if it is running."""
         if self._websocket_server:
@@ skipping 191 matching lines @@
             return config_file_from_env
 
         config_file_name = self._apache_config_file_name_for_platform()
         return self._filesystem.join(self.apache_config_directory(), config_file_name)
 
     def _apache_version(self):
         config = self._executive.run_command([self.path_to_apache(), '-v'])
         return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'\1', config)
 
     def _apache_config_file_name_for_platform(self):
-        if self.host.platform.is_cygwin():
-            return 'cygwin-httpd.conf'  # CYGWIN is the only platform to still use Apache 1.3.
         if self.host.platform.is_linux():
             distribution = self.host.platform.linux_distribution()
 
             custom_configuration_distributions = ['arch', 'debian', 'redhat']
             if distribution in custom_configuration_distributions:
                 return '%s-httpd-%s.conf' % (distribution, self._apache_version())
 
         return 'apache2-httpd-' + self._apache_version() + '.conf'
 
     def _path_to_driver(self, target=None):
@@ skipping 161 matching lines @@
             return any(test_input.test_name.startswith(directory) for directory in self._options.pixel_test_directories)
         # TODO(burnik): Make sure this is the right way to do it.
         if self.should_use_wptserve(test_input.test_name):
             return False
         return True
 
     def should_run_pixel_test_first(self, test_input):
         return any(test_input.test_name.startswith(
             directory) for directory in self._options.image_first_tests)
 
-    def _convert_path(self, path):
-        """Handles filename conversion for subprocess command line args."""
-        # See note above in diff_image() for why we need this.
-        if sys.platform == 'cygwin':
-            return cygpath(path)
-        return path
-
     def _build_path(self, *comps):
         return self._build_path_with_target(self._options.target, *comps)
 
     def _build_path_with_target(self, target, *comps):
         # Note that we don't do the option caching that the base class does,
         # because finding the right directory is relatively fast.
         target = target or self.get_option('target')
         return self._static_build_path(self._filesystem, self.get_option('build_directory'),
                                        self.path_from_chromium_base(), target, comps)
 
@@ skipping 46 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)