Commit 271fe4fb authored by allan.jensen@digia.com's avatar allan.jensen@digia.com
Browse files

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154739 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 74afab63
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>
Http tests fails on Debian with Apache 2.4
......
......@@ -156,7 +156,7 @@ sub getHTTPDConfigPathForTestDirectory
}
$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 {
......
......@@ -569,7 +569,8 @@ MOCK output of child process
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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment