Title: [154739] trunk/Tools
- Revision
- 154739
- Author
- [email protected]
- Date
- 2013-08-28 06:21:55 -0700 (Wed, 28 Aug 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (154738 => 154739)
--- trunk/Tools/ChangeLog 2013-08-28 13:12:52 UTC (rev 154738)
+++ trunk/Tools/ChangeLog 2013-08-28 13:21:55 UTC (rev 154739)
@@ -3,6 +3,20 @@
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 <[email protected]>
+
+ Http tests fails on Debian with Apache 2.4
+ https://bugs.webkit.org/show_bug.cgi?id=120352
+
Reviewed by Andreas Kling.
Select httpd.conf file for debian based on version, matching Fedora behavior.
Modified: trunk/Tools/Scripts/webkitperl/httpd.pm (154738 => 154739)
--- trunk/Tools/Scripts/webkitperl/httpd.pm 2013-08-28 13:12:52 UTC (rev 154738)
+++ trunk/Tools/Scripts/webkitperl/httpd.pm 2013-08-28 13:21:55 UTC (rev 154739)
@@ -156,7 +156,7 @@
}
$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";
} else {
Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (154738 => 154739)
--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2013-08-28 13:12:52 UTC (rev 154738)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2013-08-28 13:21:55 UTC (rev 154739)
@@ -569,7 +569,8 @@
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')
self._assert_config_file_for_platform(port, 'win32', 'apache2-httpd.conf') # win32 isn't a supported sys.platform. AppleWin/WinCairo/WinCE ports all use cygwin.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
