Commit 97479bbf authored by ap@apple.com's avatar ap@apple.com
Browse files

2009-12-01 Yuzo Fujishima <yuzo@google.com>

        Reviewed by Alexey Proskuryakov.

        Make pywebsocket log errors to a file
        https://bugs.webkit.org/show_bug.cgi?id=31604

        * Scripts/run-webkit-tests: Log output to a pywebsocket_log.txt file in results directory
        (by passing the path to the server via a recently added -l option).



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51550 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5ccf9a12
2009-12-01 Yuzo Fujishima <yuzo@google.com>
Reviewed by Alexey Proskuryakov.
Make pywebsocket log errors to a file
https://bugs.webkit.org/show_bug.cgi?id=31604
* Scripts/run-webkit-tests: Log output to a pywebsocket_log.txt file in results directory
(by passing the path to the server via a recently added -l option).
2009-12-01 Adam Roben <aroben@apple.com>
Fix tests that use the TestNetscapePlugin in Debug_Internal builds
......
......@@ -87,6 +87,7 @@ sub fileNameWithNumber($$);
sub htmlForResultsSection(\@$&);
sub isTextOnlyTest($);
sub launchWithCurrentEnv(@);
sub resolveAndMakeTestResultsDirectory();
sub numericcmp($$);
sub openDiffTool();
sub openDumpTool();
......@@ -1223,6 +1224,13 @@ sub launchWithCurrentEnv(@)
return @args;
}
sub resolveAndMakeTestResultsDirectory()
{
my $absTestResultsDirectory = File::Spec->rel2abs(glob $testResultsDirectory);
mkpath $absTestResultsDirectory;
return $absTestResultsDirectory;
}
sub openDiffTool()
{
return if $isDiffToolOpen;
......@@ -1383,11 +1391,9 @@ sub openHTTPDIfNeeded()
my $jsTestResourcesDirectory = $testDirectory . "/fast/js/resources";
my $typesConfig = "$testDirectory/http/conf/mime.types";
my $listen = "127.0.0.1:$httpdPort";
my $absTestResultsDirectory = File::Spec->rel2abs(glob $testResultsDirectory);
my $absTestResultsDirectory = resolveAndMakeTestResultsDirectory();
my $sslCertificate = "$testDirectory/http/conf/webkit-httpd.pem";
mkpath $absTestResultsDirectory;
my @args = (
"-f", "$httpdConfig",
"-C", "DocumentRoot \"$documentRoot\"",
......@@ -1440,11 +1446,15 @@ sub openWebSocketServerIfNeeded()
my $webSocketHandlerDir = "$testDirectory";
my $webSocketHandlerScanDir = "$testDirectory/websocket/tests";
my $sslCertificate = "$testDirectory/http/conf/webkit-httpd.pem";
my $absTestResultsDirectory = resolveAndMakeTestResultsDirectory();
my $logFile = "$absTestResultsDirectory/pywebsocket_log.txt";
my @args = (
"WebKitTools/pywebsocket/mod_pywebsocket/standalone.py",
"-p", "$webSocketPort",
"-d", "$webSocketHandlerDir",
"-s", "$webSocketHandlerScanDir",
"-l", "$logFile",
);
# wss is disabled until all platforms support pyOpenSSL.
# my @argsSecure = (
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment