[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c20c629b5d3d0d16842f7bc8833a2d38b9a940a3
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 16:02:19 2010 +0000

    2010-03-12  Adam Langley  <agl at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55903 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a7b24ce..eac5218 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-12  Adam Langley  <agl at 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 at apple.com>
 
         Make svn-create-patch's diffs of ObjC header files more readable
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
index 435e1e0..e147bfd 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
@@ -145,11 +145,19 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
         null.close()
 
     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):
         return "/usr/sbin/lighttpd"
@@ -172,7 +180,13 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
         return self._build_path(self._options.target, 'image_diff')
 
     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):
         """Shut down the lighttpd web server. Blocks until it's fully

-- 
WebKit Debian packaging