Another build fix after r164149.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Feb 2014 02:52:32 +0000 (02:52 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 15 Feb 2014 02:52:32 +0000 (02:52 +0000)
* Scripts/webkitpy/port/port_testcase.py:
(test_apache_config_file_name_for_platform):

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

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

index 931b85fc414b493b52320d9b77b935b2843e5083..4eb706adfc26069061a9a9befea1a656e9a8acf9 100644 (file)
@@ -1,3 +1,10 @@
+2014-02-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Another build fix after r164149.
+
+        * Scripts/webkitpy/port/port_testcase.py:
+        (test_apache_config_file_name_for_platform):
+
 2014-02-14  Ryosuke Niwa  <rniwa@webkit.org>
 
         Build fix after r164148.
index 239e7a0817abbf58c4825d7cb0d6a21d9613bcc3..02fa845ee935e4e1f72a99ac7d0cdacd0790434c 100644 (file)
@@ -554,10 +554,11 @@ MOCK output of child process
 
     def test_apache_config_file_name_for_platform(self):
         port = TestWebKitPort()
+        port._apache_version = lambda: '2.2'
         self._assert_config_file_for_platform(port, 'cygwin', 'cygwin-httpd.conf')
 
-        self._assert_config_file_for_platform(port, 'linux2', 'apache2-httpd.conf')
-        self._assert_config_file_for_platform(port, 'linux3', 'apache2-httpd.conf')
+        self._assert_config_file_for_platform(port, 'linux2', 'apache2.2-httpd.conf')
+        self._assert_config_file_for_platform(port, 'linux3', 'apache2.2-httpd.conf')
 
         port._is_redhat_based = lambda: True
         port._apache_version = lambda: '2.2'
@@ -568,9 +569,9 @@ MOCK output of child process
         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.
-        self._assert_config_file_for_platform(port, 'barf', 'apache2-httpd.conf')
+        self._assert_config_file_for_platform(port, 'mac', 'apache2.2-httpd.conf')
+        self._assert_config_file_for_platform(port, 'win32', 'apache2.2-httpd.conf')  # win32 isn't a supported sys.platform.  AppleWin/WinCairo/WinCE ports all use cygwin.
+        self._assert_config_file_for_platform(port, 'barf', 'apache2.2-httpd.conf')
 
     def test_path_to_apache_config_file(self):
         port = TestWebKitPort()