checkpoint Blink-side work to use Apache on Windows

Tools/Scripts/webkitpy/layout_tests/port/win.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 13 matching lines @@
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 """Windows implementation of the Port interface."""
 
 import os
 import logging
 
+import _winreg

[scottmg, 2014/02/04 04:58:01]

This doesn't exist on cygwin, someone will probably whine.

+
 from webkitpy.layout_tests.breakpad.dump_reader_win import DumpReaderWin
 from webkitpy.layout_tests.models import test_run_results
 from webkitpy.layout_tests.port import base
 from webkitpy.layout_tests.servers import crash_service
 
 
 _log = logging.getLogger(__name__)
 
 
 class WinPort(base.Port):
@@ skipping 27 matching lines @@
             self._dump_reader = DumpReaderWin(host, self._build_path())
             self._crash_service = None
             self._crash_service_available = None
 
     def additional_drt_flag(self):
         flags = super(WinPort, self).additional_drt_flag()
         if not self.get_option('disable_breakpad'):
             flags += ['--enable-crash-reporter', '--crash-dumps-dir=%s' % self._dump_reader.crash_dumps_directory()]
         return flags
 
+    def check_httpd(self):
+        res = super(WinPort, self).check_httpd()
+        if self.get_option('use_apache'):
+            res = self._check_reg(r'.cgi\Shell\ExecCGI\Command') and res
+            res = self._check_reg(r'.pl\Shell\ExecCGI\Command') and res
+        return res
+
+    def _check_reg(self, sub_key):
+        hkey = _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, sub_key)

[scottmg, 2014/02/04 04:58:01]

add some sort of rationalization as to why futzing with the registry is ok. :)

+        args = _winreg.QueryValue(hkey, '').split()
+        if len(args) == 2 and self._filesystem.exists(args[0]) and args[0].endswith('perl.exe') and args[1] == '-wT':
+            return True
+
+        cmdline = self.path_from_chromium_base('third_party', 'perl', 'perl', 'bin', 'perl.exe') + ' -wT'
+        _log.error("Need to set HKCR\\%s to '%s'" % (sub_key, cmdline))
+
     def setup_test_run(self):
         super(WinPort, self).setup_test_run()
 
         if not self.get_option('disable_breakpad'):
             assert not self._crash_service, 'Already running a crash service'
             if self._crash_service_available == None:
                 self._crash_service_available = self._check_crash_service_available()
             if not self._crash_service_available:
                 return
             service = crash_service.CrashService(self, self._dump_reader.crash_dumps_directory())
             service.start()
             self._crash_service = service
 
     def clean_up_test_run(self):
         super(WinPort, self).clean_up_test_run()
 
         if self._crash_service:
             self._crash_service.stop()
             self._crash_service = None
 
     def setup_environ_for_server(self, server_name=None):
         env = super(WinPort, self).setup_environ_for_server(server_name)
 
         # FIXME: lighttpd depends on some environment variable we're not whitelisting.
         # We should add the variable to an explicit whitelist in base.Port.
         # FIXME: This is a temporary hack to get the cr-win bot online until
         # someone from the cr-win port can take a look.
+        use_apache = self.get_option('use_apache')
+        apache_envvars = ['SYSTEMDRIVE', 'SYSTEMROOT', 'TEMP', 'TMP']
         for key, value in os.environ.items():
-            if key not in env:
+            if key not in env and (not use_apache or key in apache_envvars):
                 env[key] = value
 
+        if use_apache:
+            return env
+
         # Put the cygwin directory first in the path to find cygwin1.dll.
         env["PATH"] = "%s;%s" % (self.path_from_chromium_base("third_party", "cygwin", "bin"), env["PATH"])
         # Configure the cygwin directory so that pywebsocket finds proper
         # python executable to run cgi program.
         env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin", "bin")
         if self.get_option('register_cygwin'):
             setup_mount = self.path_from_chromium_base("third_party", "cygwin", "setup_mount.bat")
             self._executive.run_command([setup_mount])  # Paths are all absolute, so this does not require a cwd.
         return env
 
@@ skipping 15 matching lines @@
             _log.error('    http://dev.chromium.org/developers/how-tos/build-instructions-windows')
         return result
 
     def operating_system(self):
         return 'win'
 
     def relative_test_filename(self, filename):
         path = filename[len(self.layout_tests_dir()) + 1:]
         return path.replace('\\', '/')
 
+    def uses_apache(self):
+        return self.get_option('use_apache')
+
+    def path_to_apache(self):
+        return self.path_from_chromium_base('third_party', 'apache-win32', 'bin', 'httpd.exe')
+
+    def path_to_apache_config_file(self):
+        return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'win-httpd.conf')
+
+    def _lighttpd_path(self, *comps):
+        return self.path_from_chromium_base('third_party', 'lighttpd', 'win', *comps)
+
+    def path_to_lighttpd(self):
+        return self._lighttpd_path('LightTPD.exe')
+
+    def path_to_lighttpd_modules(self):
+        return self._lighttpd_path('lib')
+
+    def path_to_lighttpd_php(self):
+        return self._lighttpd_path('php5', 'php-cgi.exe')
+
     #
     # PROTECTED ROUTINES
     #
 
-    def _uses_apache(self):
-        return False
-
-    def _lighttpd_path(self, *comps):
-        return self.path_from_chromium_base('third_party', 'lighttpd', 'win', *comps)
-
-    def _path_to_apache(self):
-        return self.path_from_chromium_base('third_party', 'cygwin', 'usr', 'sbin', 'httpd')
-
-    def _path_to_apache_config_file(self):
-        return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'cygwin-httpd.conf')
-
-    def _path_to_lighttpd(self):
-        return self._lighttpd_path('LightTPD.exe')
-
-    def _path_to_lighttpd_modules(self):
-        return self._lighttpd_path('lib')
-
-    def _path_to_lighttpd_php(self):
-        return self._lighttpd_path('php5', 'php-cgi.exe')
-
     def _path_to_driver(self, configuration=None):
         binary_name = '%s.exe' % self.driver_name()
         return self._build_path_with_configuration(configuration, binary_name)
 
     def _path_to_helper(self):
         binary_name = 'layout_test_helper.exe'
         return self._build_path(binary_name)
 
     def _path_to_crash_service(self):
         binary_name = 'content_shell_crash_service.exe'
@@ skipping 16 matching lines @@
         return result
 
     def look_for_new_crash_logs(self, crashed_processes, start_time):
         if self.get_option('disable_breakpad'):
             return None
         return self._dump_reader.look_for_new_crash_logs(crashed_processes, start_time)
 
     def clobber_old_port_specific_results(self):
         if not self.get_option('disable_breakpad'):
             self._dump_reader.clobber_old_results()