[GTK] Rely on the general implementation for detecting the Apache server path.
authorrakuco@webkit.org <rakuco@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Oct 2012 15:26:38 +0000 (15:26 +0000)
committerrakuco@webkit.org <rakuco@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 1 Oct 2012 15:26:38 +0000 (15:26 +0000)
https://bugs.webkit.org/show_bug.cgi?id=98033

Reviewed by Martin Robinson.

The implemenentation of _path_to_apache() in base.py already
checks for the same paths gtk.py tries; the only difference is
that all of the are tried regardless of the current distro.

Doing so is more portable, and lets us remove some distro-checking
from the code.

* Scripts/webkitpy/layout_tests/port/gtk.py:
(GtkPort._path_to_apache): Remove.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@130050 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/port/gtk.py

index 10f7a74..cda9ddd 100644 (file)
@@ -1,3 +1,20 @@
+2012-10-01  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [GTK] Rely on the general implementation for detecting the Apache server path.
+        https://bugs.webkit.org/show_bug.cgi?id=98033
+
+        Reviewed by Martin Robinson.
+
+        The implemenentation of _path_to_apache() in base.py already
+        checks for the same paths gtk.py tries; the only difference is
+        that all of the are tried regardless of the current distro.
+
+        Doing so is more portable, and lets us remove some distro-checking
+        from the code.
+
+        * Scripts/webkitpy/layout_tests/port/gtk.py:
+        (GtkPort._path_to_apache): Remove.
+
 2012-10-01  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         Unreviewed, update the URL of the Szeged SVN mirror.
index f02d148..7ee76a6 100644 (file)
@@ -89,12 +89,6 @@ class GtkPort(Port, PulseAudioSanitizer):
     def _path_to_image_diff(self):
         return self._build_path('Programs', 'ImageDiff')
 
-    def _path_to_apache(self):
-        if self._is_redhat_based():
-            return '/usr/sbin/httpd'
-        else:
-            return '/usr/sbin/apache2'
-
     def _path_to_wdiff(self):
         if self._is_redhat_based():
             return '/usr/bin/dwdiff'