Changeset 154739 in webkit

Timestamp:

Aug 28, 2013 6:21:55 AM (11 years ago)

Author:

allan.jensen@digia.com

Message:

Http tests fails on Debian with Apache 2.4
​https://bugs.webkit.org/show_bug.cgi?id=120352

Unreviewed fix-up.

Remember to update unit-test expectations and old-run-webkit-tests as well.

• Scripts/webkitperl/httpd.pm:

(getHTTPDConfigPathForTestDirectory):

• Scripts/webkitpy/port/port_testcase.py:

(test_apache_config_file_name_for_platform):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitperl/httpd.pm (modified) (1 diff)
• Scripts/webkitpy/port/port_testcase.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
+
+        Http tests fails on Debian with Apache 2.4
+        https://bugs.webkit.org/show_bug.cgi?id=120352
+
+        Unreviewed fix-up.
+
+        Remember to update unit-test expectations and old-run-webkit-tests as well.
+
+        * Scripts/webkitperl/httpd.pm:
+        (getHTTPDConfigPathForTestDirectory):
+        * Scripts/webkitpy/port/port_testcase.py:
+        (test_apache_config_file_name_for_platform):
+
 2013-08-28  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Tools/Scripts/webkitperl/httpd.pm

@@ -157 +157 @@
         $httpdConfig = "cygwin-httpd.conf";  # This is an apache 1.3 config.
     } elsif (isDebianBased()) {
-        $httpdConfig = "apache2-debian-httpd.conf";
+        $httpdConfig = "debian-httpd-$apacheVersion.conf";
     } elsif (isFedoraBased()) {
         $httpdConfig = "fedora-httpd-$apacheVersion.conf";

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

@@ -570 +570 @@
         port = TestWebKitPort()
         port._is_debian_based = lambda: True
-        self._assert_config_file_for_platform(port, 'linux2', 'apache2-debian-httpd.conf')
+        port._apache_version = lambda: '2.2'
+        self._assert_config_file_for_platform(port, 'linux2', 'debian-httpd-2.2.conf')
 
         self._assert_config_file_for_platform(port, 'mac', 'apache2-httpd.conf')