- Revision
- 250330
- Author
- hironori.fu...@sony.com
- Date
- 2019-09-24 20:15:35 -0700 (Tue, 24 Sep 2019)
Log Message
[Windows][webkitpy] _apache_config_file_name_for_platform should take the system PHP version into account
https://bugs.webkit.org/show_bug.cgi?id=202134
Reviewed by Jonathan Bedard.
Tools:
_apache_config_file_name_for_platform always returns a config file
name for PHP5 on Cygwin Python, one for PHP7 on Win32 Python. It
should detect the system PHP version as Linux ports do.
Both AppleWin and WinCairo are using XAMPP Apache. Unify the code
paths for them. And, remove a stale conf file.
This change makes it possible to use Cygwin Python with PHP7.
* Scripts/webkitpy/port/base.py:
(Port._win_php_version): Added.
(Port._apache_config_file_name_for_platform): Unified cygwin and
win32 code path by using _win_php_version.
* Scripts/webkitpy/port/port_testcase.py:
(test_apache_config_file_name_for_platform): Updated cygwin and
win32 test cases.
LayoutTests:
* http/conf/cygwin-httpd.conf: Removed a stale conf file.
* http/conf/win-httpd-2.4-php5.conf: Renamed from LayoutTests/http/conf/apache2.4-httpd-win.conf.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (250329 => 250330)
--- trunk/LayoutTests/ChangeLog 2019-09-25 01:56:50 UTC (rev 250329)
+++ trunk/LayoutTests/ChangeLog 2019-09-25 03:15:35 UTC (rev 250330)
@@ -1,3 +1,13 @@
+2019-09-24 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Windows][webkitpy] _apache_config_file_name_for_platform should take the system PHP version into account
+ https://bugs.webkit.org/show_bug.cgi?id=202134
+
+ Reviewed by Jonathan Bedard.
+
+ * http/conf/cygwin-httpd.conf: Removed a stale conf file.
+ * http/conf/win-httpd-2.4-php5.conf: Renamed from LayoutTests/http/conf/apache2.4-httpd-win.conf.
+
2019-09-24 Kate Cheney <katherine_che...@apple.com>
Enable LayoutTests using ResourceLoadStatistics SQLite backend (195420)
Deleted: trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf (250329 => 250330)
--- trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf 2019-09-25 01:56:50 UTC (rev 250329)
+++ trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf 2019-09-25 03:15:35 UTC (rev 250330)
@@ -1,162 +0,0 @@
-ServerRoot "C:/xampp/apache"
-
-# Mutex file:/tmp/WebKit
-PidFile "c:/xampp/apache/logs/httpd.pid"
-#ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
-
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-
-# LoadModule unixd_module libexec/apache/mod_unixd.so
-LoadModule access_compat_module modules/mod_access_compat.so
-LoadModule authn_core_module modules/mod_authn_core.so
-LoadModule authz_core_module modules/mod_authz_core.so
-LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule include_module modules/mod_include.so
-LoadModule log_config_module modules/mod_log_config.so
-LoadModule headers_module modules/mod_headers.so
-LoadModule ssl_module modules/mod_ssl.so
-LoadModule mime_module modules/mod_mime.so
-LoadModule asis_module modules/mod_asis.so
-LoadModule cgi_module modules/mod_cgi.so
-LoadModule negotiation_module modules/mod_negotiation.so
-#LoadModule imagemap_module modules/mod_imagemap.so
-LoadModule actions_module modules/mod_actions.so
-LoadModule alias_module modules/mod_alias.so
-LoadModule rewrite_module modules/mod_rewrite.so
-LoadFile "C:/xampp/php/php5ts.dll"
-LoadFile "C:/xampp/php/libpq.dll"
-LoadModule php5_module "C:/xampp/php/php5apache2_4.dll"
-
-
-ServerName 127.0.0.1
-
-<Directory />
- Options Indexes FollowSymLinks MultiViews ExecCGI Includes
- AllowOverride All
- Order allow,deny
- Allow from all
-</Directory>
-
-AccessFileName .htaccess
-
-<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-UseCanonicalName On
-HostnameLookups Off
-
-ScriptInterpreterSource Registry-Strict
-# When using the above setting, specify the path to the Perl binary
-# using the registry keys below:
-# [HKEY_CLASSES_ROOT\.pl\Shell\ExecCGI\Command] @="c:\\PATH\TO\perl\\bin\\perl.exe"
-# HKEY_CLASSES_ROOT\.cgi\Shell\ExecCGI\Command] @="c:\\PATH\TO\perl\\bin\\perl.exe"
-
-LogLevel warn
-
-ErrorLog "C:\xampp\apache\logs\error_log.txt"
-
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b %D" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-ServerSignature On
-
-<IfModule mod_alias.c>
-</IfModule>
-
-<IfModule mod_mime.c>
- AddLanguage da .dk
- AddLanguage nl .nl
- AddLanguage en .en
- AddLanguage et .ee
- AddLanguage fr .fr
- AddLanguage de .de
- AddLanguage el .el
- AddLanguage he .he
- AddCharset ISO-8859-8 .iso8859-8
- AddLanguage it .it
- AddLanguage ja .ja
- AddCharset ISO-2022-JP .jis
- AddLanguage kr .kr
- AddCharset ISO-2022-KR .iso-kr
- AddLanguage nn .nn
- AddLanguage no .no
- AddLanguage pl .po
- AddCharset ISO-8859-2 .iso-pl
- AddLanguage pt .pt
- AddLanguage pt-br .pt-br
- AddLanguage ltz .lu
- AddLanguage ca .ca
- AddLanguage es .es
- AddLanguage sv .sv
- AddLanguage cs .cz .cs
- AddLanguage ru .ru
- AddLanguage zh-TW .zh-tw
- AddCharset Big5 .Big5 .big5
- AddCharset WINDOWS-1251 .cp-1251
- AddCharset CP866 .cp866
- AddCharset ISO-8859-5 .iso-ru
- AddCharset KOI8-R .koi8-r
- AddCharset UCS-2 .ucs2
- AddCharset UCS-4 .ucs4
- AddCharset UTF-8 .utf8
-
- <IfModule mod_negotiation.c>
- LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
- </IfModule>
-
- AddType application/x-tar .tgz
-
- AddEncoding x-compress .Z
- AddEncoding x-gzip .gz .tgz
-
- AddHandler cgi-script .cgi .pl
-
- AddType text/html .shtml
- AddHandler server-parsed .shtml
-
- AddHandler send-as-is asis
-</IfModule>
-
-<IfModule mod_php5.c>
- AddType application/x-httpd-php .php
- AddType application/x-httpd-php .bat
- AddType application/x-httpd-php-source .phps
-
- <IfModule mod_dir.c>
- DirectoryIndex index.html index.php
- </IfModule>
-
- php_flag log_errors on
- php_flag short_open_tag on
-</IfModule>
-
-<IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteCond %{REQUEST_METHOD} ^TRACE
- RewriteRule .* - [F]
-</IfModule>
-
-# Secure (SSL/TLS) connections
-#Include conf/extra/httpd-ssl.conf
-#
-# Note: The following must must be present to support
-# starting without SSL on platforms with no /dev/random equivalent
-# but a statically compiled-in mod_ssl.
-#
-<IfModule ssl_module>
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin
-</IfModule>
-
-<VirtualHost *:8443>
- ServerName 127.0.0.1
- SSLEngine On
-</VirtualHost>
Deleted: trunk/LayoutTests/http/conf/cygwin-httpd.conf (250329 => 250330)
--- trunk/LayoutTests/http/conf/cygwin-httpd.conf 2019-09-25 01:56:50 UTC (rev 250329)
+++ trunk/LayoutTests/http/conf/cygwin-httpd.conf 2019-09-25 03:15:35 UTC (rev 250330)
@@ -1,175 +0,0 @@
-ServerType standalone
-
-ServerRoot "/usr"
-LockFile "/tmp/WebKit/httpd.lock"
-PidFile "/tmp/WebKit/httpd.pid"
-ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
-
-ResourceConfig /dev/null
-AccessConfig /dev/null
-
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-
-MinSpareServers 1
-MaxSpareServers 5
-StartServers 1
-MaxClients 150
-MaxRequestsPerChild 100000
-
-LoadModule config_log_module lib/apache/mod_log_config.dll
-LoadModule mime_module lib/apache/mod_mime.dll
-LoadModule negotiation_module lib/apache/mod_negotiation.dll
-LoadModule includes_module lib/apache/mod_include.dll
-LoadModule cgi_module lib/apache/mod_cgi.dll
-LoadModule asis_module lib/apache/mod_asis.dll
-LoadModule imap_module lib/apache/mod_imap.dll
-LoadModule action_module lib/apache/mod_actions.dll
-LoadModule alias_module lib/apache/mod_alias.dll
-LoadModule rewrite_module lib/apache/mod_rewrite.dll
-LoadModule access_module lib/apache/mod_access.dll
-LoadModule auth_module lib/apache/mod_auth.dll
-LoadModule headers_module lib/apache/mod_headers.dll
-LoadModule php4_module lib/apache/libphp4.dll
-
-# Reconstruction of the complete module list from all available modules
-# (static and shared ones) to achieve correct module execution order.
-# [WHENEVER YOU CHANGE THE LOADMODULE SECTION ABOVE UPDATE THIS, TOO]
-ClearModuleList
-AddModule mod_log_config.c
-AddModule mod_mime.c
-AddModule mod_negotiation.c
-AddModule mod_include.c
-AddModule mod_cgi.c
-AddModule mod_asis.c
-AddModule mod_imap.c
-AddModule mod_actions.c
-AddModule mod_alias.c
-AddModule mod_rewrite.c
-AddModule mod_access.c
-AddModule mod_auth.c
-AddModule mod_headers.c
-AddModule mod_so.c
-AddModule mod_php4.c
-
-ServerName 127.0.0.1
-
-<Directory />
- Options Indexes FollowSymLinks MultiViews ExecCGI Includes
- AllowOverride All
- Order allow,deny
- Allow from all
-</Directory>
-
-AccessFileName .htaccess
-
-<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-UseCanonicalName On
-DefaultType text/plain
-HostnameLookups Off
-
-LogLevel warn
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %b" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-ServerSignature On
-
-<IfModule mod_alias.c>
-</IfModule>
-
-<IfModule mod_mime.c>
- AddLanguage da .dk
- AddLanguage nl .nl
- AddLanguage en .en
- AddLanguage et .ee
- AddLanguage fr .fr
- AddLanguage de .de
- AddLanguage el .el
- AddLanguage he .he
- AddCharset ISO-8859-8 .iso8859-8
- AddLanguage it .it
- AddLanguage ja .ja
- AddCharset ISO-2022-JP .jis
- AddLanguage kr .kr
- AddCharset ISO-2022-KR .iso-kr
- AddLanguage nn .nn
- AddLanguage no .no
- AddLanguage pl .po
- AddCharset ISO-8859-2 .iso-pl
- AddLanguage pt .pt
- AddLanguage pt-br .pt-br
- AddLanguage ltz .lu
- AddLanguage ca .ca
- AddLanguage es .es
- AddLanguage sv .sv
- AddLanguage cs .cz .cs
- AddLanguage ru .ru
- AddLanguage zh-TW .zh-tw
- AddCharset Big5 .Big5 .big5
- AddCharset WINDOWS-1251 .cp-1251
- AddCharset CP866 .cp866
- AddCharset ISO-8859-5 .iso-ru
- AddCharset KOI8-R .koi8-r
- AddCharset UCS-2 .ucs2
- AddCharset UCS-4 .ucs4
- AddCharset UTF-8 .utf8
-
- <IfModule mod_negotiation.c>
- LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
- </IfModule>
-
- AddType application/x-tar .tgz
-
- AddEncoding x-compress .Z
- AddEncoding x-gzip .gz .tgz
-
- AddHandler cgi-script .cgi .pl
-
- AddType text/html .shtml
- AddHandler server-parsed .shtml
-
- AddHandler send-as-is asis
-</IfModule>
-
-<IfModule mod_php4.c>
- AddType application/x-httpd-php .php
- AddType application/x-httpd-php .bat
- AddType application/x-httpd-php-source .phps
-
- <IfModule mod_dir.c>
- DirectoryIndex index.html index.php
- </IfModule>
-
- php_flag log_errors on
- php_flag short_open_tag on
-</IfModule>
-
-<IfModule mod_rewrite.c>
- RewriteEngine On
- RewriteCond %{REQUEST_METHOD} ^TRACE
- RewriteRule .* - [F]
-</IfModule>
-
-#
-# Apple-specific filesystem protection.
-#
-<Files "rsrc">
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-<Directory ~ ".*\.\.namedfork">
- Order allow,deny
- Deny from all
- Satisfy All
-</Directory>
Copied: trunk/LayoutTests/http/conf/win-httpd-2.4-php5.conf (from rev 250329, trunk/LayoutTests/http/conf/apache2.4-httpd-win.conf) (0 => 250330)
--- trunk/LayoutTests/http/conf/win-httpd-2.4-php5.conf (rev 0)
+++ trunk/LayoutTests/http/conf/win-httpd-2.4-php5.conf 2019-09-25 03:15:35 UTC (rev 250330)
@@ -0,0 +1,162 @@
+ServerRoot "C:/xampp/apache"
+
+# Mutex file:/tmp/WebKit
+PidFile "c:/xampp/apache/logs/httpd.pid"
+#ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
+
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+
+# LoadModule unixd_module libexec/apache/mod_unixd.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_core_module modules/mod_authz_core.so
+LoadModule authz_host_module modules/mod_authz_host.so
+LoadModule include_module modules/mod_include.so
+LoadModule log_config_module modules/mod_log_config.so
+LoadModule headers_module modules/mod_headers.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule asis_module modules/mod_asis.so
+LoadModule cgi_module modules/mod_cgi.so
+LoadModule negotiation_module modules/mod_negotiation.so
+#LoadModule imagemap_module modules/mod_imagemap.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadFile "C:/xampp/php/php5ts.dll"
+LoadFile "C:/xampp/php/libpq.dll"
+LoadModule php5_module "C:/xampp/php/php5apache2_4.dll"
+
+
+ServerName 127.0.0.1
+
+<Directory />
+ Options Indexes FollowSymLinks MultiViews ExecCGI Includes
+ AllowOverride All
+ Order allow,deny
+ Allow from all
+</Directory>
+
+AccessFileName .htaccess
+
+<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
+ Order allow,deny
+ Deny from all
+ Satisfy All
+</Files>
+
+UseCanonicalName On
+HostnameLookups Off
+
+ScriptInterpreterSource Registry-Strict
+# When using the above setting, specify the path to the Perl binary
+# using the registry keys below:
+# [HKEY_CLASSES_ROOT\.pl\Shell\ExecCGI\Command] @="c:\\PATH\TO\perl\\bin\\perl.exe"
+# HKEY_CLASSES_ROOT\.cgi\Shell\ExecCGI\Command] @="c:\\PATH\TO\perl\\bin\\perl.exe"
+
+LogLevel warn
+
+ErrorLog "C:\xampp\apache\logs\error_log.txt"
+
+LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %b %D" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+ServerSignature On
+
+<IfModule mod_alias.c>
+</IfModule>
+
+<IfModule mod_mime.c>
+ AddLanguage da .dk
+ AddLanguage nl .nl
+ AddLanguage en .en
+ AddLanguage et .ee
+ AddLanguage fr .fr
+ AddLanguage de .de
+ AddLanguage el .el
+ AddLanguage he .he
+ AddCharset ISO-8859-8 .iso8859-8
+ AddLanguage it .it
+ AddLanguage ja .ja
+ AddCharset ISO-2022-JP .jis
+ AddLanguage kr .kr
+ AddCharset ISO-2022-KR .iso-kr
+ AddLanguage nn .nn
+ AddLanguage no .no
+ AddLanguage pl .po
+ AddCharset ISO-8859-2 .iso-pl
+ AddLanguage pt .pt
+ AddLanguage pt-br .pt-br
+ AddLanguage ltz .lu
+ AddLanguage ca .ca
+ AddLanguage es .es
+ AddLanguage sv .sv
+ AddLanguage cs .cz .cs
+ AddLanguage ru .ru
+ AddLanguage zh-TW .zh-tw
+ AddCharset Big5 .Big5 .big5
+ AddCharset WINDOWS-1251 .cp-1251
+ AddCharset CP866 .cp866
+ AddCharset ISO-8859-5 .iso-ru
+ AddCharset KOI8-R .koi8-r
+ AddCharset UCS-2 .ucs2
+ AddCharset UCS-4 .ucs4
+ AddCharset UTF-8 .utf8
+
+ <IfModule mod_negotiation.c>
+ LanguagePriority en da nl et fr de el it ja kr no pl pt pt-br ru ltz ca es sv tw
+ </IfModule>
+
+ AddType application/x-tar .tgz
+
+ AddEncoding x-compress .Z
+ AddEncoding x-gzip .gz .tgz
+
+ AddHandler cgi-script .cgi .pl
+
+ AddType text/html .shtml
+ AddHandler server-parsed .shtml
+
+ AddHandler send-as-is asis
+</IfModule>
+
+<IfModule mod_php5.c>
+ AddType application/x-httpd-php .php
+ AddType application/x-httpd-php .bat
+ AddType application/x-httpd-php-source .phps
+
+ <IfModule mod_dir.c>
+ DirectoryIndex index.html index.php
+ </IfModule>
+
+ php_flag log_errors on
+ php_flag short_open_tag on
+</IfModule>
+
+<IfModule mod_rewrite.c>
+ RewriteEngine On
+ RewriteCond %{REQUEST_METHOD} ^TRACE
+ RewriteRule .* - [F]
+</IfModule>
+
+# Secure (SSL/TLS) connections
+#Include conf/extra/httpd-ssl.conf
+#
+# Note: The following must must be present to support
+# starting without SSL on platforms with no /dev/random equivalent
+# but a statically compiled-in mod_ssl.
+#
+<IfModule ssl_module>
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+</IfModule>
+
+<VirtualHost *:8443>
+ ServerName 127.0.0.1
+ SSLEngine On
+</VirtualHost>
Modified: trunk/Tools/ChangeLog (250329 => 250330)
--- trunk/Tools/ChangeLog 2019-09-25 01:56:50 UTC (rev 250329)
+++ trunk/Tools/ChangeLog 2019-09-25 03:15:35 UTC (rev 250330)
@@ -1,3 +1,27 @@
+2019-09-24 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Windows][webkitpy] _apache_config_file_name_for_platform should take the system PHP version into account
+ https://bugs.webkit.org/show_bug.cgi?id=202134
+
+ Reviewed by Jonathan Bedard.
+
+ _apache_config_file_name_for_platform always returns a config file
+ name for PHP5 on Cygwin Python, one for PHP7 on Win32 Python. It
+ should detect the system PHP version as Linux ports do.
+
+ Both AppleWin and WinCairo are using XAMPP Apache. Unify the code
+ paths for them. And, remove a stale conf file.
+
+ This change makes it possible to use Cygwin Python with PHP7.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._win_php_version): Added.
+ (Port._apache_config_file_name_for_platform): Unified cygwin and
+ win32 code path by using _win_php_version.
+ * Scripts/webkitpy/port/port_testcase.py:
+ (test_apache_config_file_name_for_platform): Updated cygwin and
+ win32 test cases.
+
2019-09-24 Matt Lewis <jlew...@apple.com>
Bring up queues for iPadOS Simulator Tests
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (250329 => 250330)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-09-25 01:56:50 UTC (rev 250329)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-09-25 03:15:35 UTC (rev 250330)
@@ -1288,12 +1288,20 @@
return "-php7"
return ""
+ def _win_php_version(self):
+ root = os.environ.get('XAMPP_ROOT', 'C:\\xampp')
+ prefix = self._filesystem.join(root, 'php')
+ for version in ('5', '7'):
+ conf = self._filesystem.join(prefix, "php{}ts.dll".format(version))
+ if self._filesystem.exists(conf):
+ return "-php{}".format(version)
+ _log.error("No php?ts.dll found in {}".format(prefix))
+ return ""
+
# We pass sys_platform into this method to make it easy to unit test.
def _apache_config_file_name_for_platform(self, sys_platform):
- if sys_platform == 'cygwin':
- return 'apache' + self._apache_version() + '-httpd-win.conf'
- if sys_platform == 'win32':
- return 'win-httpd-' + self._apache_version() + '-php7.conf'
+ if sys_platform in ['cygwin', 'win32']:
+ return 'win-httpd-' + self._apache_version() + self._win_php_version() + '.conf'
if sys_platform == 'darwin':
return 'apache' + self._apache_version() + self._darwin_php_version() + '-httpd.conf'
if sys_platform.startswith('linux'):
Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (250329 => 250330)
--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2019-09-25 01:56:50 UTC (rev 250329)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2019-09-25 03:15:35 UTC (rev 250330)
@@ -590,11 +590,13 @@
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', 'apache2.2-httpd-win.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._win_php_version = lambda: '-php7'
+ self._assert_config_file_for_platform(port, 'cygwin', 'win-httpd-2.2-php7.conf')
+ self._assert_config_file_for_platform(port, 'win32', 'win-httpd-2.2-php7.conf')
+
port._is_redhat_based = lambda: True
port._apache_version = lambda: '2.2'
self._assert_config_file_for_platform(port, 'linux2', 'fedora-httpd-2.2.conf')
@@ -605,7 +607,6 @@
self._assert_config_file_for_platform(port, 'linux2', 'debian-httpd-2.2.conf')
self._assert_config_file_for_platform(port, 'mac', 'apache2.2-httpd.conf')
- self._assert_config_file_for_platform(port, 'win32', 'win-httpd-2.2-php7.conf') # WinCairo uses win32. Only AppleWin port uses cygwin.
self._assert_config_file_for_platform(port, 'barf', 'apache2.2-httpd.conf')
def test_path_to_apache_config_file(self):
