Title: [202158] trunk
- Revision
- 202158
- Author
- gyuyoung....@webkit.org
- Date
- 2016-06-16 21:56:57 -0700 (Thu, 16 Jun 2016)
Log Message
[EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
https://bugs.webkit.org/show_bug.cgi?id=158141
Reviewed by Michael Catanzaro.
Tools:
* Scripts/webkitpy/port/base.py: Detect php version in system, then use it.
(Port._is_debian_php_version_7):
(Port._debian_php_version):
(Port._apache_config_file_name_for_platform):
* efl/install-dependencies:
* gtk/install-dependencies:
LayoutTests:
* http/conf/debian-httpd-2.4-php7.conf: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (202157 => 202158)
--- trunk/LayoutTests/ChangeLog 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/LayoutTests/ChangeLog 2016-06-17 04:56:57 UTC (rev 202158)
@@ -1,3 +1,12 @@
+2016-06-16 Gyuyoung Kim <gyuyoung....@webkit.org>
+
+ [EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
+ https://bugs.webkit.org/show_bug.cgi?id=158141
+
+ Reviewed by Michael Catanzaro.
+
+ * http/conf/debian-httpd-2.4-php7.conf: Added.
+
2016-06-15 Filip Pizlo <fpi...@apple.com>
Baseline JIT should be concurrent
Added: trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.conf (0 => 202158)
--- trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.conf (rev 0)
+++ trunk/LayoutTests/http/conf/debian-httpd-2.4-php7.conf 2016-06-17 04:56:57 UTC (rev 202158)
@@ -0,0 +1,148 @@
+ServerTokens OS
+ServerRoot "/usr/lib/apache2"
+
+PidFile "/tmp/WebKit/httpd.pid"
+ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
+
+Timeout 300
+KeepAlive On
+MaxKeepAliveRequests 100
+KeepAliveTimeout 15
+
+MinSpareServers 1
+MaxSpareServers 5
+StartServers 1
+MaxClients 150
+MaxRequestsPerChild 100000
+
+LoadModule mpm_prefork_module modules/mod_mpm_prefork.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 headers_module modules/mod_headers.so
+LoadModule mime_module modules/mod_mime.so
+LoadModule negotiation_module modules/mod_negotiation.so
+LoadModule actions_module modules/mod_actions.so
+LoadModule alias_module modules/mod_alias.so
+LoadModule rewrite_module modules/mod_rewrite.so
+LoadModule cgi_module modules/mod_cgi.so
+LoadModule ssl_module modules/mod_ssl.so
+LoadModule php7_module modules/libphp7.0.so
+LoadModule asis_module modules/mod_asis.so
+
+ServerName 127.0.0.1
+
+<Directory />
+ Options Indexes FollowSymLinks MultiViews ExecCGI Includes
+ AllowOverride All
+ Require all granted
+</Directory>
+
+AccessFileName .htaccess
+
+<Files ~ "^\.([Hh][Tt]|[Dd][Ss]_[Ss])">
+ Require all denied
+</Files>
+
+UseCanonicalName On
+HostnameLookups Off
+
+TypesConfig /etc/mime.types
+
+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
+ErrorLog /tmp/WebKit/error_log
+
+ServerSignature On
+
+AddLanguage ca .ca
+AddLanguage cs .cz .cs
+AddLanguage da .dk
+AddLanguage de .de
+AddLanguage el .el
+AddLanguage en .en
+AddLanguage eo .eo
+AddLanguage es .es
+AddLanguage et .et
+AddLanguage fr .fr
+AddLanguage he .he
+AddLanguage hr .hr
+AddLanguage it .it
+AddLanguage ja .ja
+AddLanguage ko .ko
+AddLanguage ltz .ltz
+AddLanguage nl .nl
+AddLanguage nn .nn
+AddLanguage no .no
+AddLanguage pl .po
+AddLanguage pt .pt
+AddLanguage pt-BR .pt-br
+AddLanguage ru .ru
+AddLanguage sv .sv
+AddLanguage zh-CN .zh-cn
+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 ca cs da de el eo es et fr he hr it ja ko ltz nl nn no pl pt pt-BR ru sv zh-CN zh-TW
+</IfModule>
+
+AddType application/x-tar .tgz
+
+AddEncoding x-compress .Z
+AddEncoding x-gzip .gz .tgz
+
+AddType application/x-x509-ca-cert .crt
+AddType application/x-pkcs7-crl .crl
+
+AddHandler cgi-script .cgi .pl
+
+AddType text/html .shtml
+AddOutputFilter INCLUDES .shtml
+
+AddHandler send-as-is asis
+
+<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>
+
+<VirtualHost *:8443>
+ ServerName 127.0.0.1
+ SSLEngine On
+</VirtualHost>
+
+#
+# Apple-specific filesystem protection.
+#
+<Files "rsrc">
+ Require all denied
+</Files>
+
+<Directory ~ ".*\.\.namedfork">
+ Require all denied
+</Directory>
Modified: trunk/Tools/ChangeLog (202157 => 202158)
--- trunk/Tools/ChangeLog 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/ChangeLog 2016-06-17 04:56:57 UTC (rev 202158)
@@ -1,3 +1,17 @@
+2016-06-16 Gyuyoung Kim <gyuyoung....@webkit.org>
+
+ [EFL][GTK] LayoutTest doesn't run on Ubuntu 16.04
+ https://bugs.webkit.org/show_bug.cgi?id=158141
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/webkitpy/port/base.py: Detect php version in system, then use it.
+ (Port._is_debian_php_version_7):
+ (Port._debian_php_version):
+ (Port._apache_config_file_name_for_platform):
+ * efl/install-dependencies:
+ * gtk/install-dependencies:
+
2016-06-16 Filip Pizlo <fpi...@apple.com>
Baseline JIT should be concurrent
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (202157 => 202158)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2016-06-17 04:56:57 UTC (rev 202158)
@@ -1130,6 +1130,11 @@
_log.error("Could not find apache. Not installed or unknown path.")
return None
+ def _is_debian_php_version_7(self):
+ if self._filesystem.exists("/usr/lib/apache2/modules/libphp7.0.so"):
+ return True
+ return False
+
# FIXME: This belongs on some platform abstraction instead of Port.
def _is_redhat_based(self):
return self._filesystem.exists('/etc/redhat-release')
@@ -1144,6 +1149,11 @@
config = self._executive.run_command([self._path_to_apache(), '-v'])
return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'\1', config)
+ def _debian_php_version(self):
+ if self._is_debian_php_version_7():
+ return "-php7"
+ 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' or sys_platform.startswith('win'):
@@ -1152,7 +1162,7 @@
if self._is_redhat_based():
return 'fedora-httpd-' + self._apache_version() + '.conf'
if self._is_debian_based():
- return 'debian-httpd-' + self._apache_version() + '.conf'
+ return 'debian-httpd-' + self._apache_version() + self._debian_php_version() + '.conf'
if self._is_arch_based():
return 'archlinux-httpd.conf'
# All platforms use apache2 except for CYGWIN (and Mac OS X Tiger and prior, which we no longer support).
Modified: trunk/Tools/efl/install-dependencies (202157 => 202158)
--- trunk/Tools/efl/install-dependencies 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/efl/install-dependencies 2016-06-17 04:56:57 UTC (rev 202158)
@@ -111,10 +111,22 @@
# These are dependencies necessary for running tests.
apt-get install \
apache2 \
- libapache2-mod-php5 \
libruby \
xvfb
+
+ installPHPWithApt
}
+function installPHPWithApt {
+ if [ -f "/etc/os-release" ]; then
+ ubuntu_version=`grep VERSION_ID /etc/os-release`
+ if [[ $ubuntu_version == *VERSION_ID=\"16.04* ]]; then
+ apt-get install libapache2-mod-php7.0
+ else
+ apt-get install libapache2-mod-php5
+ fi
+ fi
+}
+
checkInstaller
Modified: trunk/Tools/gtk/install-dependencies (202157 => 202158)
--- trunk/Tools/gtk/install-dependencies 2016-06-17 04:48:47 UTC (rev 202157)
+++ trunk/Tools/gtk/install-dependencies 2016-06-17 04:56:57 UTC (rev 202158)
@@ -138,7 +138,6 @@
curl \
dbus-x11 \
libapache2-mod-bw \
- libapache2-mod-php5 \
libgpg-error-dev \
pulseaudio-utils \
python-gi \
@@ -192,6 +191,8 @@
subversion"
apt-get install $packages
+
+ installPHPWithApt
}
function installDependenciesWithPacman {
@@ -432,5 +433,16 @@
dnf install $packages
}
+function installPHPWithApt {
+ if [ -f "/etc/os-release" ]; then
+ ubuntu_version=`grep VERSION_ID /etc/os-release`
+ if [[ $ubuntu_version == *VERSION_ID=\"16.04* ]]; then
+ apt-get install libapache2-mod-php7.0
+ else
+ apt-get install libapache2-mod-php5
+ fi
+ fi
+}
+
checkInstaller
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
