Move LayoutTest Linux distribution detection to PlatformInfo

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 1423 matching lines @@
         If the WEBKIT_HTTP_SERVER_CONF_PATH environment variable is set, its
         contents will be used instead.
 
         This is needed only by ports that use the apache_http_server module."""
         config_file_from_env = os.environ.get('WEBKIT_HTTP_SERVER_CONF_PATH')
         if config_file_from_env:
             if not self._filesystem.exists(config_file_from_env):
                 raise IOError('%s was not found on the system' % config_file_from_env)
             return config_file_from_env
 
-        config_file_name = self._apache_config_file_name_for_platform(sys.platform)
+        config_file_name = self._apache_config_file_name_for_platform()
         return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', config_file_name)
 
     #
     # PROTECTED ROUTINES
     #
     # The routines below should only be called by routines in this class
     # or any of its subclasses.
     #
 
-    # FIXME: This belongs on some platform abstraction instead of Port.
-    def _is_redhat_based(self):
-        return self._filesystem.exists('/etc/redhat-release')
-
-    def _is_debian_based(self):
-        return self._filesystem.exists('/etc/debian_version')
-
     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)
 
-    # We pass sys_platform into this method to make it easy to unit test.
-    def _apache_config_file_name_for_platform(self, sys_platform):
-        if sys_platform == 'cygwin':
+    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 sys_platform.startswith('linux'):
-            if self._is_redhat_based():
-                return 'fedora-httpd-' + self._apache_version() + '.conf'
-            if self._is_debian_based():
-                return 'debian-httpd-' + self._apache_version() + '.conf'
+        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())
+
         # All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and prior, which we no longer support).

[Dirk Pranke, 2015/06/22 22:58:05]

Can you delete line 1468 while you're at it; we don't support cygwin or tiger,
so this is at best confusing.

         return 'apache2-httpd-' + self._apache_version() + '.conf'
 
     def _path_to_driver(self, configuration=None):
         """Returns the full path to the test driver."""
         return self._build_path(self.driver_name())
 
     def _path_to_webcore_library(self):
         """Returns the full path to a built copy of WebCore."""
         return None
 
@@ skipping 284 matching lines @@
 class PhysicalTestSuite(object):
     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)