summaryrefslogtreecommitdiffstats
path: root/WebKitTools/Scripts/old-run-webkit-tests
diff options
context:
space:
mode:
Diffstat (limited to 'WebKitTools/Scripts/old-run-webkit-tests')
-rwxr-xr-xWebKitTools/Scripts/old-run-webkit-tests11
1 files changed, 7 insertions, 4 deletions
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests
index af82545..b46c129 100755
--- a/WebKitTools/Scripts/old-run-webkit-tests
+++ b/WebKitTools/Scripts/old-run-webkit-tests
@@ -298,7 +298,7 @@ Usage: $programName [options] [testdir|testpath ...]
-v|--verbose More verbose output (overrides --quiet)
-m|--merge-leak-depth arg Merges leak callStacks and prints the number of unique leaks beneath a callstack depth of arg. Defaults to 5.
--use-remote-links-to-tests Link to test files within the SVN repository in the results.
- --webkit-test-runner Use WebKitTestRunner rather than DumpRenderTree.
+ -2|--webkit-test-runner Use WebKitTestRunner rather than DumpRenderTree.
EOF
setConfiguration();
@@ -342,7 +342,7 @@ my $getOptionsResult = GetOptions(
'use-remote-links-to-tests' => \$useRemoteLinksToTests,
'valgrind' => \$useValgrind,
'verbose|v' => \$verbose,
- 'webkit-test-runner' => \$useWebKitTestRunner,
+ 'webkit-test-runner|2' => \$useWebKitTestRunner,
);
if (!$getOptionsResult || $showHelp) {
@@ -354,6 +354,9 @@ if ($useWebKitTestRunner) {
if (isAppleMacWebKit()) {
$realPlatform = $platform;
$platform = "mac-wk2";
+ } elsif (isAppleWinWebKit()) {
+ $realPlatform = $platform;
+ $platform = "win-wk2";
}
}
@@ -1895,8 +1898,8 @@ sub buildPlatformResultHierarchy()
my $isWin = $platform =~ /^win/;
if ($isMac || $isWin) {
my $effectivePlatform = $platform;
- if ($platform eq "mac-wk2") {
- push @platforms, "mac-wk2";
+ if ($platform eq "mac-wk2" || $platform eq "win-wk2") {
+ push @platforms, $platform;
$effectivePlatform = $realPlatform;
}