summaryrefslogtreecommitdiffstats
path: root/WebKitTools/Scripts/old-run-webkit-tests
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-06-15 19:36:43 +0100
committerBen Murdoch <benm@google.com>2010-06-16 14:52:28 +0100
commit545e470e52f0ac6a3a072bf559c796b42c6066b6 (patch)
treec0c14763654d84d37577dde512c3d3b4699a9e86 /WebKitTools/Scripts/old-run-webkit-tests
parent719298a66237d38ea5c05f1547123ad8aacbc237 (diff)
downloadexternal_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.zip
external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.gz
external_webkit-545e470e52f0ac6a3a072bf559c796b42c6066b6.tar.bz2
Merge webkit.org at r61121: Initial merge by git.
Change-Id: Icd6db395c62285be384d137164d95d7466c98760
Diffstat (limited to 'WebKitTools/Scripts/old-run-webkit-tests')
-rwxr-xr-xWebKitTools/Scripts/old-run-webkit-tests18
1 files changed, 18 insertions, 0 deletions
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index ac73c00..a25a24d 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -76,6 +76,7 @@ use POSIX;
sub buildPlatformResultHierarchy();
sub buildPlatformTestHierarchy(@);
+sub checkPythonVersion();
sub closeCygpaths();
sub closeDumpTool();
sub closeWebSocketServer();
@@ -149,6 +150,7 @@ my $shouldCheckLeaks = 0;
my $showHelp = 0;
my $stripEditingCallbacks = isCygwin();
my $testHTTP = 1;
+my $testWebSocket = 1;
my $testMedia = 1;
my $tmpDir = "/tmp";
my $testResultsDirectory = File::Spec->catfile($tmpDir, "layout-test-results");
@@ -224,6 +226,11 @@ if (!defined($platform)) {
$platform = "undefined";
}
+if (!checkPythonVersion()) {
+ print "WARNING: Your platform does not have Python 2.5+, which is required to run websocket server, so disabling websocket/tests.\n";
+ $testWebSocket = 0;
+}
+
my $programName = basename($0);
my $launchSafariDefault = $launchSafari ? "launch" : "do not launch";
my $httpDefault = $testHTTP ? "run" : "do not run";
@@ -457,6 +464,9 @@ if (!$testHTTP) {
$ignoredDirectories{'http'} = 1;
$ignoredDirectories{'websocket'} = 1;
}
+if (!$testWebSocket) {
+ $ignoredDirectories{'websocket'} = 1;
+}
if (!$testMedia) {
$ignoredDirectories{'media'} = 1;
@@ -1358,6 +1368,7 @@ sub openDumpTool()
# Port spesifics
if (isQt()) {
$CLEAN_ENV{QTWEBKIT_PLUGIN_PATH} = productDir() . "/lib/plugins";
+ $CLEAN_ENV{QT_DRT_WEBVIEW_MODE} = $ENV{"QT_DRT_WEBVIEW_MODE"};
}
my @args = ($dumpTool, @toolArgs);
@@ -1425,6 +1436,13 @@ sub configureAndOpenHTTPDIfNeeded()
$isHttpdOpen = openHTTPD(@args);
}
+sub checkPythonVersion()
+{
+ # we have not chdir to sourceDir yet.
+ system sourceDir() . "/WebKitTools/Scripts/ensure-valid-python", "--check-only";
+ return exitStatus($?) == 0;
+}
+
sub openWebSocketServerIfNeeded()
{
return 1 if $isWebSocketServerOpen;