[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 11c4da891bc8aeabe2d8b59774f806f1952e1d63
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 12 11:46:01 2010 +0000

    2010-12-12  Alejandro G. Castro  <alex at igalia.com>
    
            Reviewed by Eric Seidel.
    
            [GTK] Add new-run-webkit-tests support to gtk
            https://bugs.webkit.org/show_bug.cgi?id=50681
    
            Adding the basic support to run the new-run-webkit-tests.
    
            * Scripts/webkitpy/layout_tests/port/gtk.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73873 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bf11a01..99b3581 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-12  Alejandro G. Castro  <alex at igalia.com>
+
+        Reviewed by Eric Seidel.
+
+        [GTK] Add new-run-webkit-tests support to gtk
+        https://bugs.webkit.org/show_bug.cgi?id=50681
+
+        Adding the basic support to run the new-run-webkit-tests.
+
+        * Scripts/webkitpy/layout_tests/port/gtk.py:
+
 2010-10-11  Diego Gonzalez  <diegohcg at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/gtk.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/gtk.py
index c60909e..a18fdff 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/gtk.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/gtk.py
@@ -30,6 +30,7 @@
 
 import logging
 import os
+import signal
 
 from webkitpy.layout_tests.port.webkit import WebKitPort
 
@@ -81,3 +82,35 @@ class GtkPort(WebKitPort):
                 # file), so if kill fails on the given PID, just try to
                 # 'killall' web servers.
                 self._shut_down_http_server(None)
+
+    def _path_to_driver(self):
+        return self._build_path('Programs', 'DumpRenderTree')
+
+    def check_build(self, needs_http):
+        if not self._check_driver():
+            return False
+        return True
+
+    def _path_to_apache(self):
+        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',
+                            config_name)
+
+    def _path_to_wdiff(self):
+        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'))

-- 
WebKit Debian packaging