| OLD | NEW | 
|---|
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 
| 2 # | 2 # | 
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without | 
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are | 
| 5 # met: | 5 # met: | 
| 6 # | 6 # | 
| 7 #     * Redistributions of source code must retain the above copyright | 7 #     * Redistributions of source code must retain the above copyright | 
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. | 
| 9 #     * Redistributions in binary form must reproduce the above | 9 #     * Redistributions in binary form must reproduce the above | 
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer | 
| (...skipping 1372 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1383         return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'
      \1', config) | 1383         return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'
      \1', config) | 
| 1384 | 1384 | 
| 1385     # We pass sys_platform into this method to make it easy to unit test. | 1385     # We pass sys_platform into this method to make it easy to unit test. | 
| 1386     def _apache_config_file_name_for_platform(self, sys_platform): | 1386     def _apache_config_file_name_for_platform(self, sys_platform): | 
| 1387         if sys_platform == 'cygwin': | 1387         if sys_platform == 'cygwin': | 
| 1388             return 'cygwin-httpd.conf'  # CYGWIN is the only platform to still u
      se Apache 1.3. | 1388             return 'cygwin-httpd.conf'  # CYGWIN is the only platform to still u
      se Apache 1.3. | 
| 1389         if sys_platform.startswith('linux'): | 1389         if sys_platform.startswith('linux'): | 
| 1390             if self._is_redhat_based(): | 1390             if self._is_redhat_based(): | 
| 1391                 return 'fedora-httpd-' + self._apache_version() + '.conf' | 1391                 return 'fedora-httpd-' + self._apache_version() + '.conf' | 
| 1392             if self._is_debian_based(): | 1392             if self._is_debian_based(): | 
| 1393                 return 'apache2-debian-httpd.conf' | 1393                 return 'debian-httpd-' + self._apache_version() + '.conf' | 
| 1394         # All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and pr
      ior, which we no longer support). | 1394         # All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and pr
      ior, which we no longer support). | 
| 1395         return "apache2-httpd.conf" | 1395         return "apache2-httpd.conf" | 
| 1396 | 1396 | 
| 1397     def _path_to_apache_config_file(self): | 1397     def _path_to_apache_config_file(self): | 
| 1398         """Returns the full path to the apache configuration file. | 1398         """Returns the full path to the apache configuration file. | 
| 1399 | 1399 | 
| 1400         If the WEBKIT_HTTP_SERVER_CONF_PATH environment variable is set, its | 1400         If the WEBKIT_HTTP_SERVER_CONF_PATH environment variable is set, its | 
| 1401         contents will be used instead. | 1401         contents will be used instead. | 
| 1402 | 1402 | 
| 1403         This is needed only by ports that use the apache_http_server module.""" | 1403         This is needed only by ports that use the apache_http_server module.""" | 
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1721             if name.find('/') != -1: | 1721             if name.find('/') != -1: | 
| 1722                 _log.error("Virtual test suites names cannot contain /'s: %s" % 
      name) | 1722                 _log.error("Virtual test suites names cannot contain /'s: %s" % 
      name) | 
| 1723                 return | 1723                 return | 
| 1724             self.name = 'virtual/' + name + '/' + base | 1724             self.name = 'virtual/' + name + '/' + base | 
| 1725         self.base = base | 1725         self.base = base | 
| 1726         self.args = args | 1726         self.args = args | 
| 1727         self.tests = tests or set() | 1727         self.tests = tests or set() | 
| 1728 | 1728 | 
| 1729     def __repr__(self): | 1729     def __repr__(self): | 
| 1730         return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.
      args) | 1730         return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.
      args) | 
| OLD | NEW | 
|---|