Changeset 55903 in webkit

Timestamp:

Mar 12, 2010 8:02:19 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-12 Adam Langley <​agl@chromium.org>

Reviewed by Dimitri Glazkov.

[chromium]: update Linux layout test scripts for RedHat like systems.

(Tested on Fedora 12.)

​https://bugs.webkit.org/show_bug.cgi?id=35867

• Scripts/webkitpy/layout_tests/port/chromium_linux.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_linux.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-12  Adam Langley  <agl@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        [chromium]: update Linux layout test scripts for RedHat like systems.
+
+        (Tested on Fedora 12.)
+
+        https://bugs.webkit.org/show_bug.cgi?id=35867
+
+        * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
+
 2010-03-12  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py

@@ -146 +146 @@
 
     def _path_to_apache(self):
-        return '/usr/sbin/apache2'
+        if self._is_redhat_based():
+            return '/usr/sbin/httpd'
+        else:
+            return '/usr/sbin/apache2'
 
     def _path_to_apache_config_file(self):
+        if self._is_redhat_based():
+            config_name = 'fedora-httpd.conf'
+        else:
+            config_name = 'apache2-debian-httpd.conf'
+
         return os.path.join(self.layout_tests_dir(), 'http', 'conf',
-                            'apache2-debian-httpd.conf')
+                            config_name)
 
     def _path_to_lighttpd(self):
@@ -173 +181 @@
 
     def _path_to_wdiff(self):
-        return '/usr/bin/wdiff'
+        if self._is_redhat_based():
+            return '/usr/bin/dwdiff'
+        else:
+            return '/usr/bin/wdiff'
+
+    def _is_redhat_based(self):
+        return os.path.exists(os.path.join('/etc', 'redhat-release'))
 
     def _shut_down_http_server(self, server_pid):