Changeset 150128 in webkit

Timestamp:

May 15, 2013 10:23:44 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Allow http tests on Arch Linux
​https://bugs.webkit.org/show_bug.cgi?id=116155

Patch by Peter Gal <​galpeter@inf.u-szeged.hu> on 2013-05-15
Reviewed by Ryosuke Niwa.

Tools:

• Scripts/webkitpy/port/base.py:

(Port._is_arch_based): Added check for /etc/arch-release file.
(Port._apache_config_file_name_for_platform): Call the check.

• Scripts/webkitpy/port/port_testcase.py:

(test_linux_distro_detection): Testcase added.

LayoutTests:

• http/conf/archlinux-httpd.conf: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/conf/archlinux-httpd.conf (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/port/base.py (modified) (2 diffs)
• Tools/Scripts/webkitpy/port/port_testcase.py (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-05-15  Peter Gal  <galpeter@inf.u-szeged.hu>
+
+        Allow http tests on Arch Linux
+        https://bugs.webkit.org/show_bug.cgi?id=116155
+
+        Reviewed by Ryosuke Niwa.
+
+        * http/conf/archlinux-httpd.conf: Added.
+
 2013-05-15  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-15  Peter Gal  <galpeter@inf.u-szeged.hu>
+
+        Allow http tests on Arch Linux
+        https://bugs.webkit.org/show_bug.cgi?id=116155
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port._is_arch_based): Added check for /etc/arch-release file.
+        (Port._apache_config_file_name_for_platform): Call the check.
+        * Scripts/webkitpy/port/port_testcase.py:
+        (test_linux_distro_detection): Testcase added.
+
 2013-05-15  Peter Gal  <galpeter@inf.u-szeged.hu>
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -1210 +1210 @@
         return self._filesystem.exists('/etc/debian_version')
 
+    def _is_arch_based(self):
+        return self._filesystem.exists('/etc/arch-release')
+
     def _apache_version(self):
         config = self._executive.run_command([self._path_to_apache(), '-v'])
@@ -1223 +1226 @@
             if self._is_debian_based():
                 return 'apache2-debian-httpd.conf'
+            if self._is_arch_based():
+                return 'archlinux-httpd.conf'
         # All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and prior, which we no longer support).
         return "apache2-httpd.conf"

trunk/Tools/Scripts/webkitpy/port/port_testcase.py

@@ -556 +556 @@
         self.assertTrue(port._is_debian_based())
 
+        port._filesystem = MockFileSystem({'/etc/arch-release': ''})
+        self.assertFalse(port._is_redhat_based())
+        self.assertTrue(port._is_arch_based())
+
     def test_apache_config_file_name_for_platform(self):
         port = TestWebKitPort()