Title: [150128] trunk
- Revision
- 150128
- Author
- [email protected]
- Date
- 2013-05-15 10:23:44 -0700 (Wed, 15 May 2013)
Log Message
Allow http tests on Arch Linux
https://bugs.webkit.org/show_bug.cgi?id=116155
Patch by Peter Gal <[email protected]> on 2013-05-15
Reviewed by Ryosuke Niwa.
Tools:
* Scripts/webkitpy/port/base.py:
(Port._is_arch_based): Added check for /etc/arch-release file.
(Port._apache_config_file_name_for_platform): Call the check.
* Scripts/webkitpy/port/port_testcase.py:
(test_linux_distro_detection): Testcase added.
LayoutTests:
* http/conf/archlinux-httpd.conf: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (150127 => 150128)
--- trunk/LayoutTests/ChangeLog 2013-05-15 17:14:19 UTC (rev 150127)
+++ trunk/LayoutTests/ChangeLog 2013-05-15 17:23:44 UTC (rev 150128)
@@ -1,3 +1,12 @@
+2013-05-15 Peter Gal <[email protected]>
+
+ Allow http tests on Arch Linux
+ https://bugs.webkit.org/show_bug.cgi?id=116155
+
+ Reviewed by Ryosuke Niwa.
+
+ * http/conf/archlinux-httpd.conf: Added.
+
2013-05-15 Zan Dobersek <[email protected]>
Unreviewed GTK gardening.
Added: trunk/LayoutTests/http/conf/archlinux-httpd.conf (0 => 150128)
--- trunk/LayoutTests/http/conf/archlinux-httpd.conf (rev 0)
+++ trunk/LayoutTests/http/conf/archlinux-httpd.conf 2013-05-15 17:23:44 UTC (rev 150128)
@@ -0,0 +1,156 @@
+ServerRoot "/usr"
+
+LockFile "/tmp/WebKit/httpd.lock"
+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 log_config_module /usr/lib/httpd/modules/mod_log_config.so
+LoadModule mime_module /usr/lib/httpd/modules/mod_mime.so
+LoadModule negotiation_module /usr/lib/httpd/modules/mod_negotiation.so
+LoadModule include_module /usr/lib/httpd/modules/mod_include.so
+LoadModule cgi_module /usr/lib/httpd/modules/mod_cgi.so
+LoadModule asis_module /usr/lib/httpd/modules/mod_asis.so
+LoadModule imagemap_module /usr/lib/httpd/modules/mod_imagemap.so
+LoadModule actions_module /usr/lib/httpd/modules/mod_actions.so
+LoadModule alias_module /usr/lib/httpd/modules/mod_alias.so
+LoadModule rewrite_module /usr/lib/httpd/modules/mod_rewrite.so
+LoadModule authz_host_module /usr/lib/httpd/modules/mod_authz_host.so
+LoadModule headers_module /usr/lib/httpd/modules/mod_headers.so
+LoadModule ssl_module /usr/lib/httpd/modules/mod_ssl.so
+LoadModule php5_module /usr/lib/httpd/modules/libphp5.so
+
+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_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">
+ Order allow,deny
+ Deny from all
+ Satisfy All
+</Files>
+
+<Directory ~ ".*\.\.namedfork">
+ Order allow,deny
+ Deny from all
+ Satisfy All
+</Directory>
Modified: trunk/Tools/ChangeLog (150127 => 150128)
--- trunk/Tools/ChangeLog 2013-05-15 17:14:19 UTC (rev 150127)
+++ trunk/Tools/ChangeLog 2013-05-15 17:23:44 UTC (rev 150128)
@@ -1,5 +1,18 @@
2013-05-15 Peter Gal <[email protected]>
+ Allow http tests on Arch Linux
+ https://bugs.webkit.org/show_bug.cgi?id=116155
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._is_arch_based): Added check for /etc/arch-release file.
+ (Port._apache_config_file_name_for_platform): Call the check.
+ * Scripts/webkitpy/port/port_testcase.py:
+ (test_linux_distro_detection): Testcase added.
+
+2013-05-15 Peter Gal <[email protected]>
+
Remove a leftover v8 file from the watchlist
https://bugs.webkit.org/show_bug.cgi?id=116158
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (150127 => 150128)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2013-05-15 17:14:19 UTC (rev 150127)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2013-05-15 17:23:44 UTC (rev 150128)
@@ -1209,6 +1209,9 @@
def _is_debian_based(self):
return self._filesystem.exists('/etc/debian_version')
+ def _is_arch_based(self):
+ return self._filesystem.exists('/etc/arch-release')
+
def _apache_version(self):
config = self._executive.run_command([self._path_to_apache(), '-v'])
return re.sub(r'(?:.|\n)*Server version: Apache/(\d+\.\d+)(?:.|\n)*', r'\1', config)
@@ -1222,6 +1225,8 @@
return 'fedora-httpd-' + self._apache_version() + '.conf'
if self._is_debian_based():
return 'apache2-debian-httpd.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).
return "apache2-httpd.conf"
Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (150127 => 150128)
--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2013-05-15 17:14:19 UTC (rev 150127)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2013-05-15 17:23:44 UTC (rev 150128)
@@ -555,6 +555,10 @@
self.assertFalse(port._is_redhat_based())
self.assertTrue(port._is_debian_based())
+ port._filesystem = MockFileSystem({'/etc/arch-release': ''})
+ self.assertFalse(port._is_redhat_based())
+ self.assertTrue(port._is_arch_based())
+
def test_apache_config_file_name_for_platform(self):
port = TestWebKitPort()
self._assert_config_file_for_platform(port, 'cygwin', 'cygwin-httpd.conf')
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
