[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
ap at apple.com
ap at apple.com
Wed Apr 7 23:43:44 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 4d4e1c0248e4b96fe3a23e67b1b43d5770d95ef7
Author: ap at apple.com <ap at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Nov 16 18:40:03 2009 +0000
WebKitTools:
2009-11-16 Yuzo Fujishima <yuzo at google.com>
Reviewed by Alexey Proskuryakov.
Disable wss until all platforms support pyOpenSSL
https://bugs.webkit.org/show_bug.cgi?id=31479
* Scripts/run-webkit-tests:
LayoutTests:
Re-enabling WebSocket tests on Tiger and Windows, now that SSL is disabled.
* platform/mac-tiger/Skipped:
* platform/win/Skipped:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51041 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0d36b91..786b4c0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-16 Alexey Proskuryakov <ap at apple.com>
+
+ Re-enabling WebSocket tests on Tiger and Windows, now that SSL is disabled.
+
+ * platform/mac-tiger/Skipped:
+ * platform/win/Skipped:
+
2009-11-14 Antonio Gomes <tonikitoo at webkit.org>
Reviewed by Antti Koivisto.
diff --git a/LayoutTests/platform/mac-tiger/Skipped b/LayoutTests/platform/mac-tiger/Skipped
index 880a4ab..7967882 100644
--- a/LayoutTests/platform/mac-tiger/Skipped
+++ b/LayoutTests/platform/mac-tiger/Skipped
@@ -69,7 +69,3 @@ media/media-fullscreen-not-in-document.html
# Tests of accessibility functionality not supported on Tiger
accessibility/aria-list-and-listitem.html
-
-# Tests time out on Tiger
-# https://bugs.webkit.org/show_bug.cgi?id=31501
-websocket
diff --git a/LayoutTests/platform/win/Skipped b/LayoutTests/platform/win/Skipped
index aa1fde1..9ba9cc3 100644
--- a/LayoutTests/platform/win/Skipped
+++ b/LayoutTests/platform/win/Skipped
@@ -696,9 +696,5 @@ fast/multicol/single-line.html
# http://webkit.org/b/31402.
inspector/timeline-paint.html
-# WebSocket server doesn't start on Windows.
-# https://bugs.webkit.org/show_bug.cgi?id=31479
-websocket
-
# Need to add functionality to DumpRenderTree to handle error pages
fast/history/back-forward-reset-after-error-handling.html
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ae0a960..14c4590 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-16 Yuzo Fujishima <yuzo at google.com>
+
+ Reviewed by Alexey Proskuryakov.
+
+ Disable wss until all platforms support pyOpenSSL
+
+ https://bugs.webkit.org/show_bug.cgi?id=31479
+
+ * Scripts/run-webkit-tests:
+
2009-11-14 Antonio Gomes <tonikitoo at webkit.org>
Reviewed by Kenneth Christiansen.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index e45c2db..098a01b 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -120,7 +120,8 @@ my $httpdPort = 8000;
my $httpdSSLPort = 8443;
my $ignoreMetrics = 0;
my $webSocketPort = 8880;
-my $webSocketSecurePort = 9323;
+# wss is disabled until all platforms support pyOpenSSL.
+# my $webSocketSecurePort = 9323;
my $ignoreTests = '';
my $iterations = 1;
my $launchSafari = 1;
@@ -491,7 +492,8 @@ my $lastDirectory = "";
my $isHttpdOpen = 0;
my $isWebSocketServerOpen = 0;
my $webSocketServerPID = 0;
-my $webSocketSecureServerPID = 0;
+# wss is disabled until all platforms support pyOpenSSL.
+# my $webSocketSecureServerPID = 0;
sub catch_pipe { $dumpToolCrashed = 1; }
$SIG{"PIPE"} = "catch_pipe";
@@ -616,7 +618,9 @@ for my $test (@tests) {
openWebSocketServerIfNeeded();
my $path = canonpath($test);
if ($test =~ /^websocket\/tests\/ssl\//) {
- print OUT "https://127.0.0.1:$webSocketSecurePort/$path\n";
+ # wss is disabled until all platforms support pyOpenSSL.
+ print STDERR "Error: wss is disabled until all platforms support pyOpenSSL.";
+ # print OUT "https://127.0.0.1:$webSocketSecurePort/$path\n";
} else {
print OUT "http://127.0.0.1:$webSocketPort/$path\n";
}
@@ -1417,20 +1421,22 @@ sub openWebSocketServerIfNeeded()
"-d", "$webSocketHandlerDir",
"-s", "$webSocketHandlerScanDir",
);
- my @argsSecure = (
- "WebKitTools/pywebsocket/mod_pywebsocket/standalone.py",
- "-p", "$webSocketSecurePort",
- "-d", "$webSocketHandlerDir",
- "-t",
- "-k", "$sslCertificate",
- "-c", "$sslCertificate",
- );
+ # wss is disabled until all platforms support pyOpenSSL.
+ # my @argsSecure = (
+ # "WebKitTools/pywebsocket/mod_pywebsocket/standalone.py",
+ # "-p", "$webSocketSecurePort",
+ # "-d", "$webSocketHandlerDir",
+ # "-t",
+ # "-k", "$sslCertificate",
+ # "-c", "$sslCertificate",
+ # );
$ENV{"PYTHONPATH"} = $webSocketPythonPath;
$webSocketServerPID = open3(\*WEBSOCKETSERVER_IN, \*WEBSOCKETSERVER_OUT, \*WEBSOCKETSERVER_ERR, $webSocketServerPath, @args);
- $webSocketSecureServerPID = open3(\*WEBSOCKETSECURESERVER_IN, \*WEBSOCKETSECURESERVER_OUT, \*WEBSOCKETSECURESERVER_ERR, $webSocketServerPath, @argsSecure);
-
- my @listen = ("http://127.0.0.1:$webSocketPort", "https://127.0.0.1:$webSocketSecurePort");
+ # wss is disabled until all platforms support pyOpenSSL.
+ # $webSocketSecureServerPID = open3(\*WEBSOCKETSECURESERVER_IN, \*WEBSOCKETSECURESERVER_OUT, \*WEBSOCKETSECURESERVER_ERR, $webSocketServerPath, @argsSecure);
+ # my @listen = ("http://127.0.0.1:$webSocketPort", "https://127.0.0.1:$webSocketSecurePort");
+ my @listen = ("http://127.0.0.1:$webSocketPort");
for (my $i = 0; $i < @listen; $i++) {
my $retryCount = 10;
while (system("/usr/bin/curl -k -q --silent --stderr - --output /dev/null $listen[$i]") && $retryCount) {
@@ -1452,10 +1458,11 @@ sub closeWebSocketServer()
close WEBSOCKETSERVER_ERR;
kill 15, $webSocketServerPID;
- close WEBSOCKETSECURESERVER_IN;
- close WEBSOCKETSECURESERVER_OUT;
- close WEBSOCKETSECURESERVER_ERR;
- kill 15, $webSocketSecureServerPID;
+ # wss is disabled until all platforms support pyOpenSSL.
+ # close WEBSOCKETSECURESERVER_IN;
+ # close WEBSOCKETSECURESERVER_OUT;
+ # close WEBSOCKETSECURESERVER_ERR;
+ # kill 15, $webSocketSecureServerPID;
$isWebSocketServerOpen = 0;
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list