- Revision
- 130202
- Author
- commit-qu...@webkit.org
- Date
- 2012-10-02 13:28:05 -0700 (Tue, 02 Oct 2012)
Log Message
Remove MSYS-related changes to the http testing infrastructure.
https://bugs.webkit.org/show_bug.cgi?id=98183
Patch by Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com> on 2012-10-02
Reviewed by Eric Seidel.
In the process of removing the cruft that has accumulated in our
Apache configuration code, we can basically revert r77161 which
added some MSYS (mingw)-specific code to old-run-webkit-tests,
since it is not being used by any port anymore.
Tools:
* Scripts/run-webkit-httpd: Remove isMsys()-dependent hacks.
* Scripts/webkitperl/httpd.pm:
(getHTTPDPath): Remove isMsys() code path.
(getDefaultConfigForTestDirectory): Revert isMsys() hacks.
(getHTTPDConfigPathForTestDirectory): Do not point to the noew
removed apache2-msys-httpd.conf.
(convertMsysPath): Removed.
LayoutTests:
* http/conf/apache2-msys-httpd.conf: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (130201 => 130202)
--- trunk/LayoutTests/ChangeLog 2012-10-02 20:19:48 UTC (rev 130201)
+++ trunk/LayoutTests/ChangeLog 2012-10-02 20:28:05 UTC (rev 130202)
@@ -1,5 +1,19 @@
2012-10-02 Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+ Remove MSYS-related changes to the http testing infrastructure.
+ https://bugs.webkit.org/show_bug.cgi?id=98183
+
+ Reviewed by Eric Seidel.
+
+ In the process of removing the cruft that has accumulated in our
+ Apache configuration code, we can basically revert r77161 which
+ added some MSYS (mingw)-specific code to old-run-webkit-tests,
+ since it is not being used by any port anymore.
+
+ * http/conf/apache2-msys-httpd.conf: Removed.
+
+2012-10-02 Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+
Remove cases of testRunner.disableImageLoading() from the layout tests.
https://bugs.webkit.org/show_bug.cgi?id=98187
Deleted: trunk/LayoutTests/http/conf/apache2-msys-httpd.conf (130201 => 130202)
--- trunk/LayoutTests/http/conf/apache2-msys-httpd.conf 2012-10-02 20:19:48 UTC (rev 130201)
+++ trunk/LayoutTests/http/conf/apache2-msys-httpd.conf 2012-10-02 20:28:05 UTC (rev 130202)
@@ -1,162 +0,0 @@
-ServerRoot "C:/Program Files/Apache Software Foundation/Apache2.2"
-
-PidFile "/tmp/WebKit/httpd.pid"
-ScoreBoardFile "/tmp/WebKit/httpd.scoreboard"
-
-Timeout 300
-KeepAlive On
-MaxKeepAliveRequests 100
-KeepAliveTimeout 15
-
-# Configured from the httpd command line for WebKit layout tests.
-# Port 8443 is hard-coded as it is needed for the HTTPS configuration later on.
-#
-#Listen 3000
-Listen 127.0.0.1:8080
-Listen 127.0.0.1:8443
-# We listen to both IPv4 and IPv6 loop-back addresses, but ignore
-# requests to 8000 from random users on network.
-# See https://bugs.webkit.org/show_bug.cgi?id=37104
-#Listen [::1]:8000
-#Listen [::1]:8080
-#Listen [::1]:8443
-
-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 autoindex_module modules/mod_autoindex.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
-
-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 (130201 => 130202)
--- trunk/Tools/ChangeLog 2012-10-02 20:19:48 UTC (rev 130201)
+++ trunk/Tools/ChangeLog 2012-10-02 20:28:05 UTC (rev 130202)
@@ -1,3 +1,23 @@
+2012-10-02 Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
+
+ Remove MSYS-related changes to the http testing infrastructure.
+ https://bugs.webkit.org/show_bug.cgi?id=98183
+
+ Reviewed by Eric Seidel.
+
+ In the process of removing the cruft that has accumulated in our
+ Apache configuration code, we can basically revert r77161 which
+ added some MSYS (mingw)-specific code to old-run-webkit-tests,
+ since it is not being used by any port anymore.
+
+ * Scripts/run-webkit-httpd: Remove isMsys()-dependent hacks.
+ * Scripts/webkitperl/httpd.pm:
+ (getHTTPDPath): Remove isMsys() code path.
+ (getDefaultConfigForTestDirectory): Revert isMsys() hacks.
+ (getHTTPDConfigPathForTestDirectory): Do not point to the noew
+ removed apache2-msys-httpd.conf.
+ (convertMsysPath): Removed.
+
2012-10-02 Sadrul Habib Chowdhury <sad...@chromium.org>
[chromium] Make sure the touch-points in the touch-events have the correct state.
Modified: trunk/Tools/Scripts/run-webkit-httpd (130201 => 130202)
--- trunk/Tools/Scripts/run-webkit-httpd 2012-10-02 20:19:48 UTC (rev 130201)
+++ trunk/Tools/Scripts/run-webkit-httpd 2012-10-02 20:28:05 UTC (rev 130202)
@@ -70,7 +70,6 @@
my $productDir = productDir();
chdirWebKit();
my $testDirectory = File::Spec->catfile(getcwd(), "LayoutTests");
-$testDirectory = convertMsysPath($testDirectory) if isMsys();
my $listen = "127.0.0.1:$httpdPort";
$listen = "$httpdPort" if ($allInterfaces);
@@ -84,16 +83,14 @@
my @args = (
"-C", "Listen $listen",
- # Disable Keep-Alive support. Makes testing in multiple browsers easier (no need to wait
- # for another browser's connection to expire).
- "-c", "KeepAlive 0"
-);
-push @args, (
"-c", "CustomLog |/usr/bin/tee common",
"-c", "ErrorLog |/usr/bin/tee",
# Run in single-process mode, do not detach from the controlling terminal.
"-X",
-) unless isMsys();
+ # Disable Keep-Alive support. Makes testing in multiple browsers easier (no need to wait
+ # for another browser's connection to expire).
+ "-c", "KeepAlive 0"
+);
my @defaultArgs = getDefaultConfigForTestDirectory($testDirectory);
@args = (@defaultArgs, @args);
Modified: trunk/Tools/Scripts/webkitperl/httpd.pm (130201 => 130202)
--- trunk/Tools/Scripts/webkitperl/httpd.pm 2012-10-02 20:19:48 UTC (rev 130201)
+++ trunk/Tools/Scripts/webkitperl/httpd.pm 2012-10-02 20:28:05 UTC (rev 130202)
@@ -60,7 +60,6 @@
}
my $tmpDir = "/tmp";
-$tmpDir = convertMsysPath($tmpDir) if isMsys();
my $httpdLockPrefix = "WebKitHttpd.lock.";
my $myLockFile;
my $exclusiveLockFile = File::Spec->catfile($tmpDir, "WebKit.lock");
@@ -79,8 +78,6 @@
my $httpdPath;
if (isDebianBased()) {
$httpdPath = "/usr/sbin/apache2";
- } elsif (isMsys()) {
- $httpdPath = 'c:\program files\apache software foundation\apache2.2\bin\httpd.exe';
} else {
$httpdPath = "/usr/sbin/httpd";
}
@@ -113,16 +110,13 @@
"-c", "Alias /js-test-resources \"$jsTestResourcesDirectory\"",
"-c", "Alias /media-resources \"$mediaResourcesDirectory\"",
"-c", "TypesConfig \"$typesConfig\"",
+ # Apache wouldn't run CGIs with permissions==700 otherwise
+ "-c", "User \"#$<\"",
+ "-c", "LockFile \"$httpdLockFile\"",
"-c", "PidFile \"$httpdPidFile\"",
"-c", "ScoreBoardFile \"$httpdScoreBoardFile\"",
);
- push @httpdArgs, (
- # Apache wouldn't run CGIs with permissions==700 otherwise
- "-c", "User \"#$<\"",
- "-c", "LockFile \"$httpdLockFile\""
- ) unless isMsys();
-
# FIXME: Enable this on Windows once <rdar://problem/5345985> is fixed
# The version of Apache we use with Cygwin does not support SSL
my $sslCertificate = "$testDirectory/http/conf/webkit-httpd.pem";
@@ -149,8 +143,6 @@
chmod(0755, $libPHP4DllPath);
}
$httpdConfig = "cygwin-httpd.conf"; # This is an apache 1.3 config.
- } elsif (isMsys()) {
- $httpdConfig = "apache2-msys-httpd.conf";
} elsif (isDebianBased()) {
$httpdConfig = "apache2-debian-httpd.conf";
} elsif (isFedoraBased()) {
@@ -341,13 +333,3 @@
}
return $waitTime;
}
-
-sub convertMsysPath
-{
- my ($path) = @_;
- return unless isMsys();
-
- $path = `cmd.exe //c echo $path`;
- $path =~ s/\r\n$//;
- return $path;
-}
