Merge webkit.org at r58033 : Initial merge by git

Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
author: Steve Block <steveblock@google.com> 2010-04-27 16:31:00 +0100
committer: Steve Block <steveblock@google.com> 2010-05-11 14:42:12 +0100
commit: dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch)
tree: 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKitTools/Scripts/run-webkit-tests
parent: ccac38a6b48843126402088a309597e682f40fe6 (diff)
download: external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip
external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz
external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2
1 files changed, 57 insertions, 2198 deletions
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 809e078..f28f20a 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -1,2222 +1,81 @@
 #!/usr/bin/perl
-
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
-# Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
-# Copyright (C) 2007 Matt Lilek (pewtermoose@gmail.com)
-# Copyright (C) 2007 Eric Seidel <eric@webkit.org>
-# Copyright (C) 2009 Google Inc. All rights reserved.
-# Copyright (C) 2009 Andras Becsi (becsi.andras@stud.u-szeged.hu), University of Szeged
+# Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
+# modification, are permitted provided that the following conditions are
+# met:
 #
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer. 
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution. 
-# 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
-#     its contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission. 
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
 #
-# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Script to run the WebKit Open Source Project layout tests.
-
-# Run all the tests passed in on the command line.
-# If no tests are passed, find all the .html, .shtml, .xml, .xhtml, .pl, .php (and svg) files in the test directory.
-
-# Run each text.
-# Compare against the existing file xxx-expected.txt.
-# If there is a mismatch, generate xxx-actual.txt and xxx-diffs.txt.
-
-# At the end, report:
-#   the number of tests that got the expected results
-#   the number of tests that ran, but did not get the expected results
-#   the number of tests that failed to run
-#   the number of tests that were run but had no expected results to compare against
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# This file is a temporary hack.
+# It will be removed as soon as all platforms are are ready to move to
+# new-run-webkit-tests and we can then update the buildbots to explicitly
+# call old-run-webkit-tests for any platforms which will never support
+# a Python run-webkit-tests.
+
+# This is intentionally written in Perl to guarantee support on
+# the same set of platforms as old-run-webkit-tests currently supports.
+# The buildbot master.cfg also currently passes run-webkit-tests to
+# perl directly instead of executing it in a shell.
 
 use strict;
 use warnings;
 
-use Cwd;
-use Data::Dumper;
-use Fcntl qw(F_GETFL F_SETFL O_NONBLOCK);
-use File::Basename;
-use File::Copy;
-use File::Find;
-use File::Path;
-use File::Spec;
-use File::Spec::Functions;
 use FindBin;
-use Getopt::Long;
-use IPC::Open2;
-use IPC::Open3;
-use Time::HiRes qw(time usleep);
-
-use List::Util 'shuffle';
-
 use lib $FindBin::Bin;
-use webkitperl::features;
-use webkitperl::httpd;
 use webkitdirs;
-use VCSUtils;
-use POSIX;
-
-sub buildPlatformResultHierarchy();
-sub buildPlatformTestHierarchy(@);
-sub closeCygpaths();
-sub closeDumpTool();
-sub closeWebSocketServer();
-sub configureAndOpenHTTPDIfNeeded();
-sub countAndPrintLeaks($$$);
-sub countFinishedTest($$$$);
-sub deleteExpectedAndActualResults($);
-sub dumpToolDidCrash();
-sub epiloguesAndPrologues($$);
-sub expectedDirectoryForTest($;$;$);
-sub fileNameWithNumber($$);
-sub htmlForResultsSection(\@$&);
-sub isTextOnlyTest($);
-sub launchWithEnv(\@\%);
-sub resolveAndMakeTestResultsDirectory();
-sub numericcmp($$);
-sub openDiffTool();
-sub openDumpTool();
-sub parseLeaksandPrintUniqueLeaks();
-sub openWebSocketServerIfNeeded();
-sub pathcmp($$);
-sub printFailureMessageForTest($$);
-sub processIgnoreTests($$);
-sub readFromDumpToolWithTimer(**);
-sub readSkippedFiles($);
-sub recordActualResultsAndDiff($$);
-sub sampleDumpTool();
-sub setFileHandleNonBlocking(*$);
-sub slowestcmp($$);
-sub splitpath($);
-sub stripExtension($);
-sub stripMetrics($$);
-sub testCrashedOrTimedOut($$$$$);
-sub toURL($);
-sub toWindowsPath($);
-sub validateSkippedArg($$;$);
-sub writeToFile($$);
-
-# Argument handling
-my $addPlatformExceptions = 0;
-my $complexText = 0;
-my $exitAfterNFailures = 0;
-my $generateNewResults = isAppleMacWebKit() ? 1 : 0;
-my $guardMalloc = '';
-my $httpdPort = 8000;
-my $httpdSSLPort = 8443;
-my $ignoreMetrics = 0;
-my $webSocketPort = 8880;
-# wss is disabled until all platforms support pyOpenSSL.
-# my $webSocketSecurePort = 9323;
-my $ignoreTests = '';
-my $iterations = 1;
-my $launchSafari = 1;
-my $mergeDepth;
-my $pixelTests = '';
-my $platform;
-my $quiet = '';
-my $randomizeTests = 0;
-my $repeatEach = 1;
-my $report10Slowest = 0;
-my $resetResults = 0;
-my $reverseTests = 0;
-my $root;
-my $runSample = 1;
-my $shouldCheckLeaks = 0;
-my $showHelp = 0;
-my $stripEditingCallbacks = isCygwin();
-my $testHTTP = 1;
-my $testMedia = 1;
-my $tmpDir = "/tmp";
-my $testResultsDirectory = File::Spec->catfile($tmpDir, "layout-test-results");
-my $testsPerDumpTool = 1000;
-my $threaded = 0;
-# DumpRenderTree has an internal timeout of 15 seconds, so this must be > 15.
-my $timeoutSeconds = 20;
-my $tolerance = 0;
-my $treatSkipped = "default";
-my $useRemoteLinksToTests = 0;
-my $useValgrind = 0;
-my $verbose = 0;
-my $shouldWaitForHTTPD = 0;
-
-my @leaksFilenames;
-
-if (isWindows() || isMsys()) {
-    print "This script has to be run under Cygwin to function correctly.\n";
-    exit 1;
-}
-
-# Default to --no-http for wx for now.
-$testHTTP = 0 if (isWx());
-
-my $expectedTag = "expected";
-my $actualTag = "actual";
-my $prettyDiffTag = "pretty-diff";
-my $diffsTag = "diffs";
-my $errorTag = "stderr";
-
-my @macPlatforms = ("mac-tiger", "mac-leopard", "mac-snowleopard", "mac");
-
-if (isAppleMacWebKit()) {
-    if (isTiger()) {
-        $platform = "mac-tiger";
-        $tolerance = 1.0;
-    } elsif (isLeopard()) {
-        $platform = "mac-leopard";
-        $tolerance = 0.1;
-    } elsif (isSnowLeopard()) {
-        $platform = "mac-snowleopard";
-        $tolerance = 0.1;
-    } else {
-        $platform = "mac";
-    }
-} elsif (isQt()) {
-    if (isDarwin()) {
-        $platform = "qt-mac";
-    } elsif (isLinux()) {
-        $platform = "qt-linux";
-    } elsif (isWindows() || isCygwin()) {
-        $platform = "qt-win";
-    } else {
-        $platform = "qt";
-    }
-} elsif (isGtk()) {
-    $platform = "gtk";
-    if (!$ENV{"WEBKIT_TESTFONTS"}) {
-        print "The WEBKIT_TESTFONTS environment variable is not defined.\n";
-        print "You must set it before running the tests.\n";
-        print "Use git to grab the actual fonts from http://gitorious.org/qtwebkit/testfonts\n";
-        exit 1;
-    }
-} elsif (isWx()) {
-    $platform = "wx";
-} elsif (isCygwin()) {
-    $platform = "win";
-}
-
-if (!defined($platform)) {
-    print "WARNING: Your platform is not recognized. Any platform-specific results will be generated in platform/undefined.\n";
-    $platform = "undefined";
-}
-
-my $programName = basename($0);
-my $launchSafariDefault = $launchSafari ? "launch" : "do not launch";
-my $httpDefault = $testHTTP ? "run" : "do not run";
-my $sampleDefault = $runSample ? "run" : "do not run";
-
-my $usage = <<EOF;
-Usage: $programName [options] [testdir|testpath ...]
-  --add-platform-exceptions       Put new results for non-platform-specific failing tests into the platform-specific results directory
-  --complex-text                  Use the complex text code path for all text (Mac OS X and Windows only)
-  -c|--configuration config       Set DumpRenderTree build configuration
-  -g|--guard-malloc               Enable malloc guard
-  --exit-after-n-failures N       Exit after the first N failures instead of running all tests
-  -h|--help                       Show this help message
-  --[no-]http                     Run (or do not run) http tests (default: $httpDefault)
-  --[no-]wait-for-httpd           Wait for httpd if some other test session is using it already (same as WEBKIT_WAIT_FOR_HTTPD=1). (default: $shouldWaitForHTTPD) 
-  -i|--ignore-tests               Comma-separated list of directories or tests to ignore
-  --iterations n                  Number of times to run the set of tests (e.g. ABCABCABC)
-  --[no-]launch-safari            Launch (or do not launch) Safari to display test results (default: $launchSafariDefault)
-  -l|--leaks                      Enable leaks checking
-  --[no-]new-test-results         Generate results for new tests
-  --nthly n                       Restart DumpRenderTree every n tests (default: $testsPerDumpTool)
-  -p|--pixel-tests                Enable pixel tests
-  --tolerance t                   Ignore image differences less than this percentage (default: $tolerance)
-  --platform                      Override the detected platform to use for tests and results (default: $platform)
-  --port                          Web server port to use with http tests
-  -q|--quiet                      Less verbose output
-  --reset-results                 Reset ALL results (including pixel tests if --pixel-tests is set)
-  -o|--results-directory          Output results directory (default: $testResultsDirectory)
-  --random                        Run the tests in a random order
-  --repeat-each n                 Number of times to run each test (e.g. AAABBBCCC)
-  --reverse                       Run the tests in reverse alphabetical order
-  --root                          Path to root tools build
-  --[no-]sample-on-timeout        Run sample on timeout (default: $sampleDefault) (Mac OS X only)
-  -1|--singly                     Isolate each test case run (implies --nthly 1 --verbose)
-  --skipped=[default|ignore|only] Specifies how to treat the Skipped file
-                                     default: Tests/directories listed in the Skipped file are not tested
-                                     ignore:  The Skipped file is ignored
-                                     only:    Only those tests/directories listed in the Skipped file will be run
-  --slowest                       Report the 10 slowest tests
-  --ignore-metrics                Ignore metrics in tests
-  --[no-]strip-editing-callbacks  Remove editing callbacks from expected results
-  -t|--threaded                   Run a concurrent JavaScript thead with each test
-  --timeout t                     Sets the number of seconds before a test times out (default: $timeoutSeconds)
-  --valgrind                      Run DumpRenderTree inside valgrind (Qt/Linux only)
-  -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.
-EOF
-
-setConfiguration();
-
-my $getOptionsResult = GetOptions(
-    'add-platform-exceptions' => \$addPlatformExceptions,
-    'complex-text' => \$complexText,
-    'exit-after-n-failures=i' => \$exitAfterNFailures,
-    'guard-malloc|g' => \$guardMalloc,
-    'help|h' => \$showHelp,
-    'http!' => \$testHTTP,
-    'wait-for-httpd!' => \$shouldWaitForHTTPD,
-    'ignore-metrics!' => \$ignoreMetrics,
-    'ignore-tests|i=s' => \$ignoreTests,
-    'iterations=i' => \$iterations,
-    'launch-safari!' => \$launchSafari,
-    'leaks|l' => \$shouldCheckLeaks,
-    'merge-leak-depth|m:5' => \$mergeDepth,
-    'new-test-results!' => \$generateNewResults,
-    'nthly=i' => \$testsPerDumpTool,
-    'pixel-tests|p' => \$pixelTests,
-    'platform=s' => \$platform,
-    'port=i' => \$httpdPort,
-    'quiet|q' => \$quiet,
-    'random' => \$randomizeTests,
-    'repeat-each=i' => \$repeatEach,
-    'reset-results' => \$resetResults,
-    'results-directory|o=s' => \$testResultsDirectory,
-    'reverse' => \$reverseTests,
-    'root=s' => \$root,
-    'sample-on-timeout!' => \$runSample,
-    'singly|1' => sub { $testsPerDumpTool = 1; },
-    'skipped=s' => \&validateSkippedArg,
-    'slowest' => \$report10Slowest,
-    'strip-editing-callbacks!' => \$stripEditingCallbacks,
-    'threaded|t' => \$threaded,
-    'timeout=i' => \$timeoutSeconds,
-    'tolerance=f' => \$tolerance,
-    'use-remote-links-to-tests' => \$useRemoteLinksToTests,
-    'valgrind' => \$useValgrind,
-    'verbose|v' => \$verbose,
-);
-
-if (!$getOptionsResult || $showHelp) {
-    print STDERR $usage;
-    exit 1;
-}
-
-my $ignoreSkipped = $treatSkipped eq "ignore";
-my $skippedOnly = $treatSkipped eq "only";
-
-my $configuration = configuration();
-
-# We need an environment variable to be able to enable the feature per-slave
-$shouldWaitForHTTPD = $ENV{"WEBKIT_WAIT_FOR_HTTPD"} unless ($shouldWaitForHTTPD);
-$verbose = 1 if $testsPerDumpTool == 1;
-
-if ($shouldCheckLeaks && $testsPerDumpTool > 1000) {
-    print STDERR "\nWARNING: Running more than 1000 tests at a time with MallocStackLogging enabled may cause a crash.\n\n";
-}
-
-# Stack logging does not play well with QuickTime on Tiger (rdar://problem/5537157)
-$testMedia = 0 if $shouldCheckLeaks && isTiger();
-
-# Generating remote links causes a lot of unnecessary spew on GTK build bot
-$useRemoteLinksToTests = 0 if isGtk();
-
-setConfigurationProductDir(Cwd::abs_path($root)) if (defined($root));
-my $productDir = productDir();
-$productDir .= "/bin" if isQt();
-$productDir .= "/Programs" if isGtk();
-
-chdirWebKit();
-
-if (!defined($root)) {
-    print STDERR "Running build-dumprendertree\n";
-
-    local *DEVNULL;
-    my ($childIn, $childOut, $childErr);
-    if ($quiet) {
-        open(DEVNULL, ">", File::Spec->devnull()) or die "Failed to open /dev/null";
-        $childOut = ">&DEVNULL";
-        $childErr = ">&DEVNULL";
-    } else {
-        # When not quiet, let the child use our stdout/stderr.
-        $childOut = ">&STDOUT";
-        $childErr = ">&STDERR";
-    }
-
-    my @args = argumentsForConfiguration();
-    my $buildProcess = open3($childIn, $childOut, $childErr, "WebKitTools/Scripts/build-dumprendertree", @args) or die "Failed to run build-dumprendertree";
-    close($childIn);
-    waitpid $buildProcess, 0;
-    my $buildResult = $?;
-    close($childOut);
-    close($childErr);
-
-    close DEVNULL if ($quiet);
-
-    if ($buildResult) {
-        print STDERR "Compiling DumpRenderTree failed!\n";
-        exit exitStatus($buildResult);
-    }
-}
-
-my $dumpToolName = "DumpRenderTree";
-$dumpToolName .= "_debug" if isCygwin() && configurationForVisualStudio() !~ /^Release|Debug_Internal$/;
-my $dumpTool = "$productDir/$dumpToolName";
-die "can't find executable $dumpToolName (looked in $productDir)\n" unless -x $dumpTool;
-
-my $imageDiffTool = "$productDir/ImageDiff";
-$imageDiffTool .= "_debug" if isCygwin() && configurationForVisualStudio() !~ /^Release|Debug_Internal$/;
-die "can't find executable $imageDiffTool (looked in $productDir)\n" if $pixelTests && !-x $imageDiffTool;
-
-checkFrameworks() unless isCygwin();
-
-if (isAppleMacWebKit()) {
-    push @INC, $productDir;
-    require DumpRenderTreeSupport;
-}
-
-my $layoutTestsName = "LayoutTests";
-my $testDirectory = File::Spec->rel2abs($layoutTestsName);
-my $expectedDirectory = $testDirectory;
-my $platformBaseDirectory = catdir($testDirectory, "platform");
-my $platformTestDirectory = catdir($platformBaseDirectory, $platform);
-my @platformResultHierarchy = buildPlatformResultHierarchy();
-my @platformTestHierarchy = buildPlatformTestHierarchy(@platformResultHierarchy);
-
-$expectedDirectory = $ENV{"WebKitExpectedTestResultsDirectory"} if $ENV{"WebKitExpectedTestResultsDirectory"};
-
-$testResultsDirectory = File::Spec->rel2abs($testResultsDirectory);
-my $testResults = File::Spec->catfile($testResultsDirectory, "results.html");
-
-print "Running tests from $testDirectory\n";
-if ($pixelTests) {
-    print "Enabling pixel tests with a tolerance of $tolerance%\n";
-    if (isDarwin()) {
-        print "WARNING: Temporarily changing the main display color profile:\n";
-        print "\tThe colors on your screen will change for the duration of the testing.\n";
-        print "\tThis allows the pixel tests to have consistent color values across all machines.\n";
-        
-        if (isPerianInstalled()) {
-            print "WARNING: Perian's QuickTime component is installed and this may affect pixel test results!\n";
-            print "\tYou should avoid generating new pixel results in this environment.\n";
-            print "\tSee https://bugs.webkit.org/show_bug.cgi?id=22615 for details.\n";
-        }
-    }
-}
-
-system "ln", "-s", $testDirectory, "/tmp/LayoutTests" unless -x "/tmp/LayoutTests";
-
-my %ignoredFiles = ( "results.html" => 1 );
-my %ignoredDirectories = map { $_ => 1 } qw(platform);
-my %ignoredLocalDirectories = map { $_ => 1 } qw(.svn _svn resources script-tests);
-my %supportedFileExtensions = map { $_ => 1 } qw(html shtml xml xhtml pl php);
-
-if (!checkWebCoreFeatureSupport("MathML", 0)) {
-    $ignoredDirectories{'mathml'} = 1;
-}
-
-# FIXME: We should fix webkitperl/features.pm:hasFeature() to do the correct feature detection for Cygwin.
-if (checkWebCoreFeatureSupport("SVG", 0)) {
-    $supportedFileExtensions{'svg'} = 1;
-} elsif (isCygwin()) {
-    $supportedFileExtensions{'svg'} = 1;
-} else {
-    $ignoredLocalDirectories{'svg'} = 1;
-}
-
-if (!$testHTTP) {
-    $ignoredDirectories{'http'} = 1;
-    $ignoredDirectories{'websocket'} = 1;
-}
-
-if (!$testMedia) {
-    $ignoredDirectories{'media'} = 1;
-    $ignoredDirectories{'http/tests/media'} = 1;
-}
-
-if (!checkWebCoreFeatureSupport("Accelerated Compositing", 0)) {
-    $ignoredDirectories{'compositing'} = 1;
-}
-
-if (!checkWebCoreFeatureSupport("3D Rendering", 0)) {
-    $ignoredDirectories{'animations/3d'} = 1;
-    $ignoredDirectories{'transforms/3d'} = 1;
-}
-
-if (!checkWebCoreFeatureSupport("3D Canvas", 0)) {
-    $ignoredDirectories{'fast/canvas/webgl'} = 1;
-}
-
-if (checkWebCoreFeatureSupport("WML", 0)) {
-    $supportedFileExtensions{'wml'} = 1;
-} else {
-    $ignoredDirectories{'http/tests/wml'} = 1;
-    $ignoredDirectories{'fast/wml'} = 1;
-    $ignoredDirectories{'wml'} = 1;
-}
-
-if (!checkWebCoreFeatureSupport("XHTMLMP", 0)) {
-    $ignoredDirectories{'fast/xhtmlmp'} = 1;
-}
-
-processIgnoreTests($ignoreTests, "ignore-tests") if $ignoreTests;
-if (!$ignoreSkipped) {
-    if (!$skippedOnly || @ARGV == 0) {
-        readSkippedFiles("");
-    } else {
-        # Since readSkippedFiles() appends to @ARGV, we must use a foreach
-        # loop so that we only iterate over the original argument list.
-        foreach my $argnum (0 .. $#ARGV) {
-            readSkippedFiles(shift @ARGV);
-        }
-    }
-}
-
-my @tests = findTestsToRun();
-
-die "no tests to run\n" if !@tests;
-
-my %counts;
-my %tests;
-my %imagesPresent;
-my %imageDifferences;
-my %durations;
-my $count = 0;
-my $leaksOutputFileNumber = 1;
-my $totalLeaks = 0;
-
-my @toolArgs = ();
-push @toolArgs, "--pixel-tests" if $pixelTests;
-push @toolArgs, "--threaded" if $threaded;
-push @toolArgs, "--complex-text" if $complexText;
-push @toolArgs, "-";
-
-my @diffToolArgs = ();
-push @diffToolArgs, "--tolerance", $tolerance;
-
-$| = 1;
-
-my $dumpToolPID;
-my $isDumpToolOpen = 0;
-my $dumpToolCrashed = 0;
-my $imageDiffToolPID;
-my $isDiffToolOpen = 0;
-
-my $atLineStart = 1;
-my $lastDirectory = "";
-
-my $isHttpdOpen = 0;
-my $isWebSocketServerOpen = 0;
-my $webSocketServerPID = 0;
-my $failedToStartWebSocketServer = 0;
-# wss is disabled until all platforms support pyOpenSSL.
-# my $webSocketSecureServerPID = 0;
-
-sub catch_pipe { $dumpToolCrashed = 1; }
-$SIG{"PIPE"} = "catch_pipe";
-
-print "Testing ", scalar @tests, " test cases";
-print " $iterations times" if ($iterations > 1);
-print ", repeating each test $repeatEach times" if ($repeatEach > 1);
-print ".\n";
-
-my $overallStartTime = time;
-
-my %expectedResultPaths;
-
-my @originalTests = @tests;
-# Add individual test repetitions
-if ($repeatEach > 1) {
-    @tests = ();
-    foreach my $test (@originalTests) {
-        for (my $i = 0; $i < $repeatEach; $i++) {
-            push(@tests, $test);
-        }
-    }
-}
-# Add test set repetitions
-for (my $i = 1; $i < $iterations; $i++) {
-    push(@tests, @originalTests);
-}
-
-for my $test (@tests) {
-    my $newDumpTool = not $isDumpToolOpen;
-    openDumpTool();
-
-    my $base = stripExtension($test);
-    my $expectedExtension = ".txt";
-    
-    my $dir = $base;
-    $dir =~ s|/[^/]+$||;
-
-    if ($newDumpTool || $dir ne $lastDirectory) {
-        foreach my $logue (epiloguesAndPrologues($newDumpTool ? "" : $lastDirectory, $dir)) {
-            if (isCygwin()) {
-                $logue = toWindowsPath($logue);
-            } else {
-                $logue = canonpath($logue);
-            }
-            if ($verbose) {
-                print "running epilogue or prologue $logue\n";
-            }
-            print OUT "$logue\n";
-            # Throw away output from DumpRenderTree.
-            # Once for the test output and once for pixel results (empty)
-            while (<IN>) {
-                last if /#EOF/;
-            }
-            while (<IN>) {
-                last if /#EOF/;
-            }
-        }
-    }
-
-    if ($verbose) {
-        print "running $test -> ";
-        $atLineStart = 0;
-    } elsif (!$quiet) {
-        if ($dir ne $lastDirectory) {
-            print "\n" unless $atLineStart;
-            print "$dir ";
-        }
-        print ".";
-        $atLineStart = 0;
-    }
-
-    $lastDirectory = $dir;
-
-    my $result;
-
-    my $startTime = time if $report10Slowest;
-
-    # Try to read expected hash file for pixel tests
-    my $suffixExpectedHash = "";
-    if ($pixelTests && !$resetResults) {
-        my $expectedPixelDir = expectedDirectoryForTest($base, 0, "png");
-        if (open EXPECTEDHASH, "$expectedPixelDir/$base-$expectedTag.checksum") {
-            my $expectedHash = <EXPECTEDHASH>;
-            chomp($expectedHash);
-            close EXPECTEDHASH;
-            
-            # Format expected hash into a suffix string that is appended to the path / URL passed to DRT
-            $suffixExpectedHash = "'$expectedHash";
-        }
-    }
-
-    if ($test =~ /^http\//) {
-        configureAndOpenHTTPDIfNeeded();
-        if ($test !~ /^http\/tests\/local\// && $test !~ /^http\/tests\/ssl\// && $test !~ /^http\/tests\/wml\// && $test !~ /^http\/tests\/media\//) {
-            my $path = canonpath($test);
-            $path =~ s/^http\/tests\///;
-            print OUT "http://127.0.0.1:$httpdPort/$path$suffixExpectedHash\n";
-        } elsif ($test =~ /^http\/tests\/ssl\//) {
-            my $path = canonpath($test);
-            $path =~ s/^http\/tests\///;
-            print OUT "https://127.0.0.1:$httpdSSLPort/$path$suffixExpectedHash\n";
-        } else {
-            my $testPath = "$testDirectory/$test";
-            if (isCygwin()) {
-                $testPath = toWindowsPath($testPath);
-            } else {
-                $testPath = canonpath($testPath);
-            }
-            print OUT "$testPath$suffixExpectedHash\n";
-        }
-    } elsif ($test =~ /^websocket\//) {
-        if ($test =~ /^websocket\/tests\/local\//) {
-            my $testPath = "$testDirectory/$test";
-            if (isCygwin()) {
-                $testPath = toWindowsPath($testPath);
-            } else {
-                $testPath = canonpath($testPath);
-            }
-            print OUT "$testPath\n";
-        } else {
-            if (openWebSocketServerIfNeeded()) {
-                my $path = canonpath($test);
-                if ($test =~ /^websocket\/tests\/ssl\//) {
-                    # 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";
-                }
-            } else {
-                # We failed to launch the WebSocket server.  Display a useful error message rather than attempting
-                # to run tests that expect the server to be available.
-                my $errorMessagePath = "$testDirectory/websocket/resources/server-failed-to-start.html";
-                $errorMessagePath = isCygwin() ? toWindowsPath($errorMessagePath) : canonpath($errorMessagePath);
-                print OUT "$errorMessagePath\n";
-            }
-        }
-    } else {
-        my $testPath = "$testDirectory/$test";
-        if (isCygwin()) {
-            $testPath = toWindowsPath($testPath);
-        } else {
-            $testPath = canonpath($testPath);
-        }
-        print OUT "$testPath$suffixExpectedHash\n" if defined $testPath;
-    }
-
-    # DumpRenderTree is expected to dump two "blocks" to stdout for each test.
-    # Each block is terminated by a #EOF on a line by itself.
-    # The first block is the output of the test (in text, RenderTree or other formats).
-    # The second block is for optional pixel data in PNG format, and may be empty if
-    # pixel tests are not being run, or the test does not dump pixels (e.g. text tests).
-    my $readResults = readFromDumpToolWithTimer(IN, ERROR);
-
-    my $actual = $readResults->{output};
-    my $error = $readResults->{error};
-
-    $expectedExtension = $readResults->{extension};
-    my $expectedFileName = "$base-$expectedTag.$expectedExtension";
-
-    my $isText = isTextOnlyTest($actual);
-
-    my $expectedDir = expectedDirectoryForTest($base, $isText, $expectedExtension);
-    $expectedResultPaths{$base} = "$expectedDir/$expectedFileName";
-
-    unless ($readResults->{status} eq "success") {
-        my $crashed = $readResults->{status} eq "crashed";
-        testCrashedOrTimedOut($test, $base, $crashed, $actual, $error);
-        countFinishedTest($test, $base, $crashed ? "crash" : "timedout", 0);
-        next;
-    }
-
-    $durations{$test} = time - $startTime if $report10Slowest;
-
-    my $expected;
-
-    if (!$resetResults && open EXPECTED, "<", "$expectedDir/$expectedFileName") {
-        $expected = "";
-        while (<EXPECTED>) {
-            next if $stripEditingCallbacks && $_ =~ /^EDITING DELEGATE:/;
-            $expected .= $_;
-        }
-        close EXPECTED;
-    }
-
-    if ($ignoreMetrics && !$isText && defined $expected) {
-        ($actual, $expected) = stripMetrics($actual, $expected);
-    }
-
-    if ($shouldCheckLeaks && $testsPerDumpTool == 1) {
-        print "        $test -> ";
-    }
-
-    my $actualPNG = "";
-    my $diffPNG = "";
-    my $diffPercentage = 0;
-    my $diffResult = "passed";
-
-    my $actualHash = "";
-    my $expectedHash = "";
-    my $actualPNGSize = 0;
-
-    while (<IN>) {
-        last if /#EOF/;
-        if (/ActualHash: ([a-f0-9]{32})/) {
-            $actualHash = $1;
-        } elsif (/ExpectedHash: ([a-f0-9]{32})/) {
-            $expectedHash = $1;
-        } elsif (/Content-Length: (\d+)\s*/) {
-            $actualPNGSize = $1;
-            read(IN, $actualPNG, $actualPNGSize);
-        }
-    }
-
-    if ($verbose && $pixelTests && !$resetResults && $actualPNGSize) {
-        if ($actualHash eq "" && $expectedHash eq "") {
-            printFailureMessageForTest($test, "WARNING: actual & expected pixel hashes are missing!");
-        } elsif ($actualHash eq "") {
-            printFailureMessageForTest($test, "WARNING: actual pixel hash is missing!");
-        } elsif ($expectedHash eq "") {
-            printFailureMessageForTest($test, "WARNING: expected pixel hash is missing!");
-        }
-    }
 
-    if ($actualPNGSize > 0) {
-        my $expectedPixelDir = expectedDirectoryForTest($base, 0, "png");
-
-        if (!$resetResults && ($expectedHash ne $actualHash || ($actualHash eq "" && $expectedHash eq ""))) {
-            if (-f "$expectedPixelDir/$base-$expectedTag.png") {
-                my $expectedPNGSize = -s "$expectedPixelDir/$base-$expectedTag.png";
-                my $expectedPNG = "";
-                open EXPECTEDPNG, "$expectedPixelDir/$base-$expectedTag.png";
-                read(EXPECTEDPNG, $expectedPNG, $expectedPNGSize);
-
-                openDiffTool();
-                print DIFFOUT "Content-Length: $actualPNGSize\n";
-                print DIFFOUT $actualPNG;
-
-                print DIFFOUT "Content-Length: $expectedPNGSize\n";
-                print DIFFOUT $expectedPNG;
-
-                while (<DIFFIN>) {
-                    last if /^error/ || /^diff:/;
-                    if (/Content-Length: (\d+)\s*/) {
-                        read(DIFFIN, $diffPNG, $1);
-                    }
-                }
-
-                if (/^diff: (.+)% (passed|failed)/) {
-                    $diffPercentage = $1 + 0;
-                    $imageDifferences{$base} = $diffPercentage;
-                    $diffResult = $2;
-                }
-                
-                if (!$diffPercentage) {
-                    printFailureMessageForTest($test, "pixel hash failed (but pixel test still passes)");
-                }
-            } elsif ($verbose) {
-                printFailureMessageForTest($test, "WARNING: expected image is missing!");
-            }
-        }
-
-        if ($resetResults || !-f "$expectedPixelDir/$base-$expectedTag.png") {
-            mkpath catfile($expectedPixelDir, dirname($base)) if $testDirectory ne $expectedPixelDir;
-            writeToFile("$expectedPixelDir/$base-$expectedTag.png", $actualPNG);
-        }
-
-        if ($actualHash ne "" && ($resetResults || !-f "$expectedPixelDir/$base-$expectedTag.checksum")) {
-            writeToFile("$expectedPixelDir/$base-$expectedTag.checksum", $actualHash);
-        }
-    }
-
-    if (dumpToolDidCrash()) {
-        $result = "crash";
-        testCrashedOrTimedOut($test, $base, 1, $actual, $error);
-    } elsif (!defined $expected) {
-        if ($verbose) {
-            print "new " . ($resetResults ? "result" : "test") ."\n";
-            $atLineStart = 1;
-        }
-        $result = "new";
-
-        if ($generateNewResults || $resetResults) {
-            mkpath catfile($expectedDir, dirname($base)) if $testDirectory ne $expectedDir;
-            writeToFile("$expectedDir/$expectedFileName", $actual);
-        }
-        deleteExpectedAndActualResults($base);
-        recordActualResultsAndDiff($base, $actual);
-        if (!$resetResults) {
-            # Always print the file name for new tests, as they will probably need some manual inspection.
-            # in verbose mode we already printed the test case, so no need to do it again.
-            unless ($verbose) {
-                print "\n" unless $atLineStart;
-                print "$test -> ";
-            }
-            my $resultsDir = catdir($expectedDir, dirname($base));
-            if ($generateNewResults) {
-                print "new (results generated in $resultsDir)\n";
-            } else {
-                print "new\n";
-            }
-            $atLineStart = 1;
-        }
-    } elsif ($actual eq $expected && $diffResult eq "passed") {
-        if ($verbose) {
-            print "succeeded\n";
-            $atLineStart = 1;
-        }
-        $result = "match";
-        deleteExpectedAndActualResults($base);
-    } else {
-        $result = "mismatch";
-
-        my $pixelTestFailed = $pixelTests && $diffPNG && $diffPNG ne "";
-        my $testFailed = $actual ne $expected;
-
-        my $message = !$testFailed ? "pixel test failed" : "failed";
-
-        if (($testFailed || $pixelTestFailed) && $addPlatformExceptions) {
-            my $testBase = catfile($testDirectory, $base);
-            my $expectedBase = catfile($expectedDir, $base);
-            my $testIsMaximallyPlatformSpecific = $testBase =~ m|^\Q$platformTestDirectory\E/|;
-            my $expectedResultIsMaximallyPlatformSpecific = $expectedBase =~ m|^\Q$platformTestDirectory\E/|;
-            if (!$testIsMaximallyPlatformSpecific && !$expectedResultIsMaximallyPlatformSpecific) {
-                mkpath catfile($platformTestDirectory, dirname($base));
-                if ($testFailed) {
-                    my $expectedFile = catfile($platformTestDirectory, "$expectedFileName");
-                    writeToFile("$expectedFile", $actual);
-                }
-                if ($pixelTestFailed) {
-                    my $expectedFile = catfile($platformTestDirectory, "$base-$expectedTag.checksum");
-                    writeToFile("$expectedFile", $actualHash);
-
-                    $expectedFile = catfile($platformTestDirectory, "$base-$expectedTag.png");
-                    writeToFile("$expectedFile", $actualPNG);
-                }
-                $message .= " (results generated in $platformTestDirectory)";
-            }
-        }
-
-        printFailureMessageForTest($test, $message);
-
-        my $dir = "$testResultsDirectory/$base";
-        $dir =~ s|/([^/]+)$|| or die "Failed to find test name from base\n";
-        my $testName = $1;
-        mkpath $dir;
-
-        deleteExpectedAndActualResults($base);
-        recordActualResultsAndDiff($base, $actual);
-
-        if ($pixelTestFailed) {
-            $imagesPresent{$base} = 1;
-
-            writeToFile("$testResultsDirectory/$base-$actualTag.png", $actualPNG);
-            writeToFile("$testResultsDirectory/$base-$diffsTag.png", $diffPNG);
-
-            my $expectedPixelDir = expectedDirectoryForTest($base, 0, "png");
-            copy("$expectedPixelDir/$base-$expectedTag.png", "$testResultsDirectory/$base-$expectedTag.png");
-
-            open DIFFHTML, ">$testResultsDirectory/$base-$diffsTag.html" or die;
-            print DIFFHTML "<html>\n";
-            print DIFFHTML "<head>\n";
-            print DIFFHTML "<title>$base Image Compare</title>\n";
-            print DIFFHTML "<script language=\"Javascript\" type=\"text/javascript\">\n";
-            print DIFFHTML "var currentImage = 0;\n";
-            print DIFFHTML "var imageNames = new Array(\"Actual\", \"Expected\");\n";
-            print DIFFHTML "var imagePaths = new Array(\"$testName-$actualTag.png\", \"$testName-$expectedTag.png\");\n";
-            if (-f "$testDirectory/$base-w3c.png") {
-                copy("$testDirectory/$base-w3c.png", "$testResultsDirectory/$base-w3c.png");
-                print DIFFHTML "imageNames.push(\"W3C\");\n";
-                print DIFFHTML "imagePaths.push(\"$testName-w3c.png\");\n";
-            }
-            print DIFFHTML "function animateImage() {\n";
-            print DIFFHTML "    var image = document.getElementById(\"animatedImage\");\n";
-            print DIFFHTML "    var imageText = document.getElementById(\"imageText\");\n";
-            print DIFFHTML "    image.src = imagePaths[currentImage];\n";
-            print DIFFHTML "    imageText.innerHTML = imageNames[currentImage] + \" Image\";\n";
-            print DIFFHTML "    currentImage = (currentImage + 1) % imageNames.length;\n";
-            print DIFFHTML "    setTimeout('animateImage()',2000);\n";
-            print DIFFHTML "}\n";
-            print DIFFHTML "</script>\n";
-            print DIFFHTML "</head>\n";
-            print DIFFHTML "<body onLoad=\"animateImage();\">\n";
-            print DIFFHTML "<table>\n";
-            if ($diffPercentage) {
-                print DIFFHTML "<tr>\n";
-                print DIFFHTML "<td>Difference between images: <a href=\"$testName-$diffsTag.png\">$diffPercentage%</a></td>\n";
-                print DIFFHTML "</tr>\n";
-            }
-            print DIFFHTML "<tr>\n";
-            print DIFFHTML "<td><a href=\"" . toURL("$testDirectory/$test") . "\">test file</a></td>\n";
-            print DIFFHTML "</tr>\n";
-            print DIFFHTML "<tr>\n";
-            print DIFFHTML "<td id=\"imageText\" style=\"text-weight: bold;\">Actual Image</td>\n";
-            print DIFFHTML "</tr>\n";
-            print DIFFHTML "<tr>\n";
-            print DIFFHTML "<td><img src=\"$testName-$actualTag.png\" id=\"animatedImage\"></td>\n";
-            print DIFFHTML "</tr>\n";
-            print DIFFHTML "</table>\n";
-            print DIFFHTML "</body>\n";
-            print DIFFHTML "</html>\n";
-        }
-    }
-
-    if ($error) {
-        my $dir = "$testResultsDirectory/$base";
-        $dir =~ s|/([^/]+)$|| or die "Failed to find test name from base\n";
-        mkpath $dir;
-        
-        writeToFile("$testResultsDirectory/$base-$errorTag.txt", $error);
-        
-        $counts{error}++;
-        push @{$tests{error}}, $test;
-    }
-
-    countFinishedTest($test, $base, $result, $isText);
-
-    # --reset-results does not check pass vs. fail, so exitAfterNFailures makes no sense with --reset-results.
-    if ($exitAfterNFailures && !$resetResults) {
-        my $passCount = $counts{match} || 0; # $counts{match} will be undefined if we've not yet passed a test (e.g. the first test fails).
-        my $failureCount = $count - $passCount; # "Failure" here includes new tests, timeouts, crashes, etc.
-        if ($failureCount >= $exitAfterNFailures) {
-            print "\nExiting early after $failureCount failures. $count tests run.";
-            closeDumpTool();
-            last;
-        }
-    }
-}
-my $totalTestingTime = time - $overallStartTime;
-my $waitTime = getWaitTime();
-if ($waitTime > 0.1) {
-    my $normalizedTestingTime = $totalTestingTime - $waitTime;
-    printf "\n%0.2fs HTTPD waiting time\n", $waitTime . "";
-    printf "%0.2fs normalized testing time", $normalizedTestingTime . "";
-}
-printf "\n%0.2fs total testing time\n", $totalTestingTime . "";
-
-!$isDumpToolOpen || die "Failed to close $dumpToolName.\n";
-
-$isHttpdOpen = !closeHTTPD();
-closeWebSocketServer();
-
-# Because multiple instances of this script are running concurrently we cannot 
-# safely delete this symlink.
-# system "rm /tmp/LayoutTests";
-
-# FIXME: Do we really want to check the image-comparison tool for leaks every time?
-if ($isDiffToolOpen && $shouldCheckLeaks) {
-    $totalLeaks += countAndPrintLeaks("ImageDiff", $imageDiffToolPID, "$testResultsDirectory/ImageDiff-leaks.txt");
-}
-
-if ($totalLeaks) {
-    if ($mergeDepth) {
-        parseLeaksandPrintUniqueLeaks();
-    } else { 
-        print "\nWARNING: $totalLeaks total leaks found!\n";
-        print "See above for individual leaks results.\n" if ($leaksOutputFileNumber > 2);
-    }
-}
-
-close IN;
-close OUT;
-close ERROR;
-
-if ($report10Slowest) {
-    print "\n\nThe 10 slowest tests:\n\n";
-    my $count = 0;
-    for my $test (sort slowestcmp keys %durations) {
-        printf "%0.2f secs: %s\n", $durations{$test}, $test;
-        last if ++$count == 10;
-    }
-}
-
-print "\n";
-
-if ($skippedOnly && $counts{"match"}) {
-    print "The following tests are in the Skipped file (" . File::Spec->abs2rel("$platformTestDirectory/Skipped", $testDirectory) . "), but succeeded:\n";
-    foreach my $test (@{$tests{"match"}}) {
-        print "  $test\n";
-    }
-}
-
-if ($resetResults || ($counts{match} && $counts{match} == $count)) {
-    print "all $count test cases succeeded\n";
-    unlink $testResults;
-    exit;
-}
-
-printResults();
-
-mkpath $testResultsDirectory;
-
-open HTML, ">", $testResults or die "Failed to open $testResults. $!";
-print HTML "<html>\n";
-print HTML "<head>\n";
-print HTML "<title>Layout Test Results</title>\n";
-print HTML "</head>\n";
-print HTML "<body>\n";
-
-if ($ignoreMetrics) {
-    print HTML "<h4>Tested with metrics ignored.</h4>";
-}
-
-print HTML htmlForResultsSection(@{$tests{mismatch}}, "Tests where results did not match expected results", \&linksForMismatchTest);
-print HTML htmlForResultsSection(@{$tests{timedout}}, "Tests that timed out", \&linksForErrorTest);
-print HTML htmlForResultsSection(@{$tests{crash}}, "Tests that caused the DumpRenderTree tool to crash", \&linksForErrorTest);
-print HTML htmlForResultsSection(@{$tests{error}}, "Tests that had stderr output", \&linksForErrorTest);
-print HTML htmlForResultsSection(@{$tests{new}}, "Tests that had no expected results (probably new)", \&linksForNewTest);
-
-print HTML "</body>\n";
-print HTML "</html>\n";
-close HTML;
-
-my @configurationArgs = argumentsForConfiguration();
-
-if (isGtk()) {
-  system "WebKitTools/Scripts/run-launcher", @configurationArgs, "file://".$testResults if $launchSafari;
-} elsif (isQt()) {
-  unshift @configurationArgs, qw(-graphicssystem raster -style windows);
-  if (isCygwin()) {
-    $testResults = "/" . toWindowsPath($testResults);
-    $testResults =~ s/\\/\//g;
-  }
-  system "WebKitTools/Scripts/run-launcher", @configurationArgs, "file://".$testResults if $launchSafari;
-} elsif (isCygwin()) {
-  system "cygstart", $testResults if $launchSafari;
-} else {
-  system "WebKitTools/Scripts/run-safari", @configurationArgs, "-NSOpen", $testResults if $launchSafari;
-}
-
-closeCygpaths() if isCygwin();
-
-exit 1;
-
-sub countAndPrintLeaks($$$)
+sub runningOnBuildBot()
 {
-    my ($dumpToolName, $dumpToolPID, $leaksFilePath) = @_;
-
-    print "\n" unless $atLineStart;
-    $atLineStart = 1;
-
-    # We are excluding the following reported leaks so they don't get in our way when looking for WebKit leaks:
-    # This allows us ignore known leaks and only be alerted when new leaks occur. Some leaks are in the old
-    # versions of the system frameworks that are being used by the leaks bots. Even though a leak has been
-    # fixed, it will be listed here until the bot has been updated with the newer frameworks.
-
-    my @typesToExclude = (
-    );
-
-    my @callStacksToExclude = (
-        "Flash_EnforceLocalSecurity" # leaks in Flash plug-in code, rdar://problem/4449747
-    );
-
-    if (isTiger()) {
-        # Leak list for the version of Tiger used on the build bot.
-        push @callStacksToExclude, (
-            "CFRunLoopRunSpecific \\| malloc_zone_malloc", "CFRunLoopRunSpecific \\| CFAllocatorAllocate ", # leak in CFRunLoopRunSpecific, rdar://problem/4670839
-            "CGImageSourceGetPropertiesAtIndex", # leak in ImageIO, rdar://problem/4628809
-            "FOGetCoveredUnicodeChars", # leak in ATS, rdar://problem/3943604
-            "GetLineDirectionPreference", "InitUnicodeUtilities", # leaks tool falsely reporting leak in CFNotificationCenterAddObserver, rdar://problem/4964790
-            "ICCFPrefWrapper::GetPrefDictionary", # leaks in Internet Config. code, rdar://problem/4449794
-            "NSHTTPURLProtocol setResponseHeader:", # leak in multipart/mixed-replace handling in Foundation, no Radar, but fixed in Leopard
-            "NSURLCache cachedResponseForRequest", # leak in CFURL cache, rdar://problem/4768430
-            "PCFragPrepareClosureFromFile", # leak in Code Fragment Manager, rdar://problem/3426998
-            "WebCore::Selection::toRange", # bug in 'leaks', rdar://problem/4967949
-            "WebCore::SubresourceLoader::create", # bug in 'leaks', rdar://problem/4985806
-            "_CFPreferencesDomainDeepCopyDictionary", # leak in CFPreferences, rdar://problem/4220786
-            "_objc_msgForward", # leak in NSSpellChecker, rdar://problem/4965278
-            "gldGetString", # leak in OpenGL, rdar://problem/5013699
-            "_setDefaultUserInfoFromURL", # leak in NSHTTPAuthenticator, rdar://problem/5546453 
-            "SSLHandshake", # leak in SSL, rdar://problem/5546440 
-            "SecCertificateCreateFromData", # leak in SSL code, rdar://problem/4464397
-        );
-        push @typesToExclude, (
-            "THRD", # bug in 'leaks', rdar://problem/3387783
-            "DRHT", # ditto (endian little hate i)
-        );
-    }
-
-    if (isLeopard()) {
-        # Leak list for the version of Leopard used on the build bot.
-        push @callStacksToExclude, (
-            "CFHTTPMessageAppendBytes", # leak in CFNetwork, rdar://problem/5435912
-            "sendDidReceiveDataCallback", # leak in CFNetwork, rdar://problem/5441619
-            "_CFHTTPReadStreamReadMark", # leak in CFNetwork, rdar://problem/5441468
-            "httpProtocolStart", # leak in CFNetwork, rdar://problem/5468837
-            "_CFURLConnectionSendCallbacks", # leak in CFNetwork, rdar://problem/5441600
-            "DispatchQTMsg", # leak in QuickTime, PPC only, rdar://problem/5667132
-            "QTMovieContentView createVisualContext", # leak in QuickTime, PPC only, rdar://problem/5667132
-            "_CopyArchitecturesForJVMVersion", # leak in Java, rdar://problem/5910823
-        );
-    }
-
-    if (isSnowLeopard()) {
-        push @callStacksToExclude, (
-            "readMakerNoteProps", # <rdar://problem/7156432> leak in ImageIO
-            "QTKitMovieControllerView completeUISetup", # <rdar://problem/7155156> leak in QTKit
-        );
-    }
-
-    my $leaksTool = sourceDir() . "/WebKitTools/Scripts/run-leaks";
-    my $excludeString = "--exclude-callstack '" . (join "' --exclude-callstack '", @callStacksToExclude) . "'";
-    $excludeString .= " --exclude-type '" . (join "' --exclude-type '", @typesToExclude) . "'" if @typesToExclude;
-
-    print " ? checking for leaks in $dumpToolName\n";
-    my $leaksOutput = `$leaksTool $excludeString $dumpToolPID`;
-    my ($count, $bytes) = $leaksOutput =~ /Process $dumpToolPID: (\d+) leaks? for (\d+) total/;
-    my ($excluded) = $leaksOutput =~ /(\d+) leaks? excluded/;
-
-    my $adjustedCount = $count;
-    $adjustedCount -= $excluded if $excluded;
-
-    if (!$adjustedCount) {
-        print " - no leaks found\n";
-        unlink $leaksFilePath;
-        return 0;
-    } else {
-        my $dir = $leaksFilePath;
-        $dir =~ s|/[^/]+$|| or die;
-        mkpath $dir;
-
-        if ($excluded) {
-            print " + $adjustedCount leaks ($bytes bytes including $excluded excluded leaks) were found, details in $leaksFilePath\n";
-        } else {
-            print " + $count leaks ($bytes bytes) were found, details in $leaksFilePath\n";
-        }
-
-        writeToFile($leaksFilePath, $leaksOutput);
-        
-        push @leaksFilenames, $leaksFilePath;
-    }
-
-    return $adjustedCount;
-}
-
-sub writeToFile($$)
-{
-    my ($filePath, $contents) = @_;
-    open NEWFILE, ">", "$filePath" or die "Could not create $filePath. $!\n";
-    print NEWFILE $contents;
-    close NEWFILE;
-}
-
-# Break up a path into the directory (with slash) and base name.
-sub splitpath($)
-{
-    my ($path) = @_;
-
-    my $pathSeparator = "/";
-    my $dirname = dirname($path) . $pathSeparator;
-    $dirname = "" if $dirname eq "." . $pathSeparator;
-
-    return ($dirname, basename($path));
-}
-
-# Sort first by directory, then by file, so all paths in one directory are grouped
-# rather than being interspersed with items from subdirectories.
-# Use numericcmp to sort directory and filenames to make order logical.
-sub pathcmp($$)
-{
-    my ($patha, $pathb) = @_;
-
-    my ($dira, $namea) = splitpath($patha);
-    my ($dirb, $nameb) = splitpath($pathb);
-
-    return numericcmp($dira, $dirb) if $dira ne $dirb;
-    return numericcmp($namea, $nameb);
-}
-
-# Sort numeric parts of strings as numbers, other parts as strings.
-# Makes 1.33 come after 1.3, which is cool.
-sub numericcmp($$)
-{
-    my ($aa, $bb) = @_;
-
-    my @a = split /(\d+)/, $aa;
-    my @b = split /(\d+)/, $bb;
-
-    # Compare one chunk at a time.
-    # Each chunk is either all numeric digits, or all not numeric digits.
-    while (@a && @b) {
-        my $a = shift @a;
-        my $b = shift @b;
-        
-        # Use numeric comparison if chunks are non-equal numbers.
-        return $a <=> $b if $a =~ /^\d/ && $b =~ /^\d/ && $a != $b;
-
-        # Use string comparison if chunks are any other kind of non-equal string.
-        return $a cmp $b if $a ne $b;
-    }
-    
-    # One of the two is now empty; compare lengths for result in this case.
-    return @a <=> @b;
-}
-
-# Sort slowest tests first.
-sub slowestcmp($$)
-{
-    my ($testa, $testb) = @_;
-
-    my $dura = $durations{$testa};
-    my $durb = $durations{$testb};
-    return $durb <=> $dura if $dura != $durb;
-    return pathcmp($testa, $testb);
-}
-
-sub launchWithEnv(\@\%)
-{
-    my ($args, $env) = @_;
-
-    # Dump the current environment as perl code and then put it in quotes so it is one parameter.
-    my $environmentDumper = Data::Dumper->new([\%{$env}], [qw(*ENV)]);
-    $environmentDumper->Indent(0);
-    $environmentDumper->Purity(1);
-    my $allEnvVars = $environmentDumper->Dump();
-    unshift @{$args}, "\"$allEnvVars\"";
-
-    my $execScript = File::Spec->catfile(sourceDir(), qw(WebKitTools Scripts execAppWithEnv));
-    unshift @{$args}, $execScript;
-    return @{$args};
-}
-
-sub resolveAndMakeTestResultsDirectory()
-{
-    my $absTestResultsDirectory = File::Spec->rel2abs(glob $testResultsDirectory);
-    mkpath $absTestResultsDirectory;
-    return $absTestResultsDirectory;
-}
-
-sub openDiffTool()
-{
-    return if $isDiffToolOpen;
-    return if !$pixelTests;
-
-    my %CLEAN_ENV;
-    $CLEAN_ENV{MallocStackLogging} = 1 if $shouldCheckLeaks;
-    $imageDiffToolPID = open2(\*DIFFIN, \*DIFFOUT, $imageDiffTool, launchWithEnv(@diffToolArgs, %CLEAN_ENV)) or die "unable to open $imageDiffTool\n";
-    $isDiffToolOpen = 1;
+    # This is a hack to detect if we're running on the buildbot so we can
+    # pass --verbose to new-run-webkit-tests.  This will be removed when we
+    # update the buildbot config to call new-run-webkit-tests explicitly.
+    my %isBuildBotUser = ("apple" => 1, "buildbot" => 1);
+    return $isBuildBotUser{$ENV{"USER"}};
 }
 
-sub openDumpTool()
+sub useNewRunWebKitTests()
 {
-    return if $isDumpToolOpen;
-
-    my %CLEAN_ENV;
-
-    # Generic environment variables
-    if (defined $ENV{'WEBKIT_TESTFONTS'}) {
-        $CLEAN_ENV{WEBKIT_TESTFONTS} = $ENV{'WEBKIT_TESTFONTS'};
-    }
-
-    $CLEAN_ENV{XML_CATALOG_FILES} = ""; # work around missing /etc/catalog <rdar://problem/4292995>
-
-    # Platform spesifics
-    if (isLinux()) {
-        if (defined $ENV{'DISPLAY'}) {
-            $CLEAN_ENV{DISPLAY} = $ENV{'DISPLAY'};
-        } else {
-            $CLEAN_ENV{DISPLAY} = ":1";
-        }
-        if (defined $ENV{'XAUTHORITY'}) {
-            $CLEAN_ENV{XAUTHORITY} = $ENV{'XAUTHORITY'};
-        }
-
-        $CLEAN_ENV{HOME} = $ENV{'HOME'};
-
-        if (defined $ENV{'LD_LIBRARY_PATH'}) {
-            $CLEAN_ENV{LD_LIBRARY_PATH} = $ENV{'LD_LIBRARY_PATH'};
-        }
-        if (defined $ENV{'DBUS_SESSION_BUS_ADDRESS'}) {
-            $CLEAN_ENV{DBUS_SESSION_BUS_ADDRESS} = $ENV{'DBUS_SESSION_BUS_ADDRESS'};
-        }
-    } elsif (isDarwin()) {
-        if (defined $ENV{'DYLD_LIBRARY_PATH'}) {
-            $CLEAN_ENV{DYLD_LIBRARY_PATH} = $ENV{'DYLD_LIBRARY_PATH'};
-        }
-
-        $CLEAN_ENV{DYLD_FRAMEWORK_PATH} = $productDir;
-        $CLEAN_ENV{DYLD_INSERT_LIBRARIES} = "/usr/lib/libgmalloc.dylib" if $guardMalloc;
-    } elsif (isCygwin()) {
-        $CLEAN_ENV{HOMEDRIVE} = $ENV{'HOMEDRIVE'};
-        $CLEAN_ENV{HOMEPATH} = $ENV{'HOMEPATH'};
-
-        setPathForRunningWebKitApp(\%CLEAN_ENV);
-    }
-
-    # Port spesifics
-    if (isQt()) {
-        $CLEAN_ENV{QTWEBKIT_PLUGIN_PATH} = productDir() . "/lib/plugins";
-    }
-    
-    my @args = ($dumpTool, @toolArgs);
-    if (isAppleMacWebKit() and !isTiger()) { 
-        unshift @args, "arch", "-" . architecture();             
-    }
-
-    if ($useValgrind) {
-        unshift @args, "valgrind", "--suppressions=$platformBaseDirectory/qt/SuppressedValgrindErrors";
-    } 
-
-    $CLEAN_ENV{MallocStackLogging} = 1 if $shouldCheckLeaks;
-
-    $dumpToolPID = open3(\*OUT, \*IN, \*ERROR, launchWithEnv(@args, %CLEAN_ENV)) or die "Failed to start tool: $dumpTool\n";
-    $isDumpToolOpen = 1;
-    $dumpToolCrashed = 0;
-}
-
-sub closeDumpTool()
-{
-    return if !$isDumpToolOpen;
-
-    close IN;
-    close OUT;
-    waitpid $dumpToolPID, 0;
-    
-    # check for WebCore counter leaks.
-    if ($shouldCheckLeaks) {
-        while (<ERROR>) {
-            print;
-        }
-    }
-    close ERROR;
-    $isDumpToolOpen = 0;
-}
-
-sub dumpToolDidCrash()
-{
-    return 1 if $dumpToolCrashed;
-    return 0 unless $isDumpToolOpen;
-    my $pid = waitpid(-1, WNOHANG);
-    return 1 if ($pid == $dumpToolPID);
-
-    # On Mac OS X, crashing may be significantly delayed by crash reporter.
-    return 0 unless isAppleMacWebKit();
-
-    return DumpRenderTreeSupport::processIsCrashing($dumpToolPID);
-}
-
-sub configureAndOpenHTTPDIfNeeded()
-{
-    return if $isHttpdOpen;
-    my $absTestResultsDirectory = resolveAndMakeTestResultsDirectory();
-    my $listen = "127.0.0.1:$httpdPort";
-    my @args = (
-        "-c", "CustomLog \"$absTestResultsDirectory/access_log.txt\" common",
-        "-c", "ErrorLog \"$absTestResultsDirectory/error_log.txt\"",
-        "-C", "Listen $listen"
-    );
-
-    my @defaultArgs = getDefaultConfigForTestDirectory($testDirectory);
-    @args = (@defaultArgs, @args);
-
-    waitForHTTPDLock() if $shouldWaitForHTTPD;
-    $isHttpdOpen = openHTTPD(@args);
-}
-
-sub openWebSocketServerIfNeeded()
-{
-    return 1 if $isWebSocketServerOpen;
-    return 0 if $failedToStartWebSocketServer;
-
-    my $webSocketServerPath = "/usr/bin/python";
-    my $webSocketPythonPath = "WebKitTools/pywebsocket";
-    my $webSocketHandlerDir = "$testDirectory";
-    my $webSocketHandlerScanDir = "$testDirectory/websocket/tests";
-    my $webSocketHandlerMapFile = "$webSocketHandlerScanDir/handler_map.txt";
-    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",
-        "-m", "$webSocketHandlerMapFile",
-        "-x", "/websocket/tests/cookies",
-        "-l", "$logFile",
-        "--strict",
-    );
-    # 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);
-    # 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) {
-            sleep 1;
-            --$retryCount;
-        }
-        unless ($retryCount) {
-            print STDERR "Timed out waiting for WebSocketServer to start.\n";
-            $failedToStartWebSocketServer = 1;
-            return 0;
-        }
-    }
-
-    $isWebSocketServerOpen = 1;
-    return 1;
-}
-
-sub closeWebSocketServer()
-{
-    return if !$isWebSocketServerOpen;
-
-    close WEBSOCKETSERVER_IN;
-    close WEBSOCKETSERVER_OUT;
-    close WEBSOCKETSERVER_ERR;
-    kill 15, $webSocketServerPID;
-
-    # wss is disabled until all platforms support pyOpenSSL.
-    # close WEBSOCKETSECURESERVER_IN;
-    # close WEBSOCKETSECURESERVER_OUT;
-    # close WEBSOCKETSECURESERVER_ERR;
-    # kill 15, $webSocketSecureServerPID;
-
-    $isWebSocketServerOpen = 0;
-}
-
-sub fileNameWithNumber($$)
-{
-    my ($base, $number) = @_;
-    return "$base$number" if ($number > 1);
-    return $base;
-}
-
-sub processIgnoreTests($$)
-{
-    my @ignoreList = split(/\s*,\s*/, shift);
-    my $listName = shift;
-
-    my $disabledSuffix = "-disabled";
-
-    my $addIgnoredDirectories = sub {
-        return () if exists $ignoredLocalDirectories{basename($File::Find::dir)};
-        $ignoredDirectories{File::Spec->abs2rel($File::Find::dir, $testDirectory)} = 1;
-        return @_;
-    };
-    foreach my $item (@ignoreList) {
-        my $path = catfile($testDirectory, $item); 
-        if (-d $path) {
-            $ignoredDirectories{$item} = 1;
-            find({ preprocess => $addIgnoredDirectories, wanted => sub {} }, $path);
-        }
-        elsif (-f $path) {
-            $ignoredFiles{$item} = 1;
-        } elsif (-f $path . $disabledSuffix) {
-            # The test is disabled, so do nothing.
-        } else {
-            print "$listName list contained '$item', but no file of that name could be found\n";
-        }
-    }
-}
-
-sub stripExtension($)
-{
-    my ($test) = @_;
-
-    $test =~ s/\.[a-zA-Z]+$//;
-    return $test;
-}
-
-sub isTextOnlyTest($)
-{
-    my ($actual) = @_;
-    my $isText;
-    if ($actual =~ /^layer at/ms) {
-        $isText = 0;
-    } else {
-        $isText = 1;
-    }
-    return $isText;
-}
-
-sub expectedDirectoryForTest($;$;$)
-{
-    my ($base, $isText, $expectedExtension) = @_;
-
-    my @directories = @platformResultHierarchy;
-    push @directories, map { catdir($platformBaseDirectory, $_) } qw(mac-snowleopard mac) if isCygwin();
-    push @directories, $expectedDirectory;
-
-    # If we already have expected results, just return their location.
-    foreach my $directory (@directories) {
-        return $directory if (-f "$directory/$base-$expectedTag.$expectedExtension");
-    }
-
-    # For cross-platform tests, text-only results should go in the cross-platform directory,
-    # while render tree dumps should go in the least-specific platform directory.
-    return $isText ? $expectedDirectory : $platformResultHierarchy[$#platformResultHierarchy];
-}
-
-sub countFinishedTest($$$$)
-{
-    my ($test, $base, $result, $isText) = @_;
-
-    if (($count + 1) % $testsPerDumpTool == 0 || $count == $#tests) {
-        if ($shouldCheckLeaks) {
-            my $fileName;
-            if ($testsPerDumpTool == 1) {
-                $fileName = "$testResultsDirectory/$base-leaks.txt";
-            } else {
-                $fileName = "$testResultsDirectory/" . fileNameWithNumber($dumpToolName, $leaksOutputFileNumber) . "-leaks.txt";
-            }
-            my $leakCount = countAndPrintLeaks($dumpToolName, $dumpToolPID, $fileName);
-            $totalLeaks += $leakCount;
-            $leaksOutputFileNumber++ if ($leakCount);
-        }
-
-        closeDumpTool();
-    }
-    
-    $count++;
-    $counts{$result}++;
-    push @{$tests{$result}}, $test;
-}
-
-sub testCrashedOrTimedOut($$$$$)
-{
-    my ($test, $base, $didCrash, $actual, $error) = @_;
-
-    printFailureMessageForTest($test, $didCrash ? "crashed" : "timed out");
-
-    sampleDumpTool() unless $didCrash;
-
-    my $dir = "$testResultsDirectory/$base";
-    $dir =~ s|/([^/]+)$|| or die "Failed to find test name from base\n";
-    mkpath $dir;
-
-    deleteExpectedAndActualResults($base);
-
-    if (defined($error) && length($error)) {
-        writeToFile("$testResultsDirectory/$base-$errorTag.txt", $error);
-    }
-
-    recordActualResultsAndDiff($base, $actual);
-
-    kill 9, $dumpToolPID unless $didCrash;
-
-    closeDumpTool();
-}
-
-sub printFailureMessageForTest($$)
-{
-    my ($test, $description) = @_;
-
-    unless ($verbose) {
-        print "\n" unless $atLineStart;
-        print "$test -> ";
-    }
-    print "$description\n";
-    $atLineStart = 1;
-}
-
-my %cygpaths = ();
-
-sub openCygpathIfNeeded($)
-{
-    my ($options) = @_;
-
-    return unless isCygwin();
-    return $cygpaths{$options} if $cygpaths{$options} && $cygpaths{$options}->{"open"};
-
-    local (*CYGPATHIN, *CYGPATHOUT);
-    my $pid = open2(\*CYGPATHIN, \*CYGPATHOUT, "cygpath -f - $options");
-    my $cygpath =  {
-        "pid" => $pid,
-        "in" => *CYGPATHIN,
-        "out" => *CYGPATHOUT,
-        "open" => 1
-    };
-
-    $cygpaths{$options} = $cygpath;
-
-    return $cygpath;
-}
-
-sub closeCygpaths()
-{
-    return unless isCygwin();
-
-    foreach my $cygpath (values(%cygpaths)) {
-        close $cygpath->{"in"};
-        close $cygpath->{"out"};
-        waitpid($cygpath->{"pid"}, 0);
-        $cygpath->{"open"} = 0;
-
-    }
-}
-
-sub convertPathUsingCygpath($$)
-{
-    my ($path, $options) = @_;
-
-    my $cygpath = openCygpathIfNeeded($options);
-    local *inFH = $cygpath->{"in"};
-    local *outFH = $cygpath->{"out"};
-    print outFH $path . "\n";
-    my $convertedPath = <inFH>;
-    chomp($convertedPath) if defined $convertedPath;
-    return $convertedPath;
-}
-
-sub toWindowsPath($)
-{
-    my ($path) = @_;
-    return unless isCygwin();
-
-    return convertPathUsingCygpath($path, "-w");
-}
-
-sub toURL($)
-{
-    my ($path) = @_;
-
-    if ($useRemoteLinksToTests) {
-        my $relativePath = File::Spec->abs2rel($path, $testDirectory);
-
-        # If the file is below the test directory then convert it into a link to the file in SVN
-        if ($relativePath !~ /^\.\.\//) {
-            my $revision = svnRevisionForDirectory($testDirectory);
-            my $svnPath = pathRelativeToSVNRepositoryRootForPath($path);
-            return "http://trac.webkit.org/export/$revision/$svnPath";
-        }
-    }
-
-    return $path unless isCygwin();
-
-    return "file:///" . convertPathUsingCygpath($path, "-m");
-}
-
-sub validateSkippedArg($$;$)
-{
-    my ($option, $value, $value2) = @_;
-    my %validSkippedValues = map { $_ => 1 } qw(default ignore only);
-    $value = lc($value);
-    die "Invalid argument '" . $value . "' for option $option" unless $validSkippedValues{$value};
-    $treatSkipped = $value;
-}
-
-sub htmlForResultsSection(\@$&)
-{
-    my ($tests, $description, $linkGetter) = @_;
-
-    my @html = ();
-    return join("\n", @html) unless @{$tests};
-
-    push @html, "<p>$description:</p>";
-    push @html, "<table>";
-    foreach my $test (@{$tests}) {
-        push @html, "<tr>";
-        push @html, "<td><a href=\"" . toURL("$testDirectory/$test") . "\">$test</a></td>";
-        foreach my $link (@{&{$linkGetter}($test)}) {
-            push @html, "<td><a href=\"$link->{href}\">$link->{text}</a></td>";
-        }
-        push @html, "</tr>";
-    }
-    push @html, "</table>";
-
-    return join("\n", @html);
-}
-
-sub linksForExpectedAndActualResults($)
-{
-    my ($base) = @_;
-
-    my @links = ();
-
-    return \@links unless -s "$testResultsDirectory/$base-$diffsTag.txt";
-    
-    my $expectedResultPath = $expectedResultPaths{$base};
-    my ($expectedResultFileName, $expectedResultsDirectory, $expectedResultExtension) = fileparse($expectedResultPath, qr{\.[^.]+$});
-
-    push @links, { href => "$base-$expectedTag$expectedResultExtension", text => "expected" };
-    push @links, { href => "$base-$actualTag$expectedResultExtension", text => "actual" };
-    push @links, { href => "$base-$diffsTag.txt", text => "diff" };
-    push @links, { href => "$base-$prettyDiffTag.html", text => "pretty diff" };
-
-    return \@links;
-}
-
-sub linksForMismatchTest
-{
-    my ($test) = @_;
-
-    my @links = ();
-
-    my $base = stripExtension($test);
-
-    push @links, @{linksForExpectedAndActualResults($base)};
-    return \@links unless $pixelTests && $imagesPresent{$base};
-
-    push @links, { href => "$base-$expectedTag.png", text => "expected image" };
-    push @links, { href => "$base-$diffsTag.html", text => "image diffs" };
-    push @links, { href => "$base-$diffsTag.png", text => "$imageDifferences{$base}%" };
-
-    return \@links;
-}
-
-sub linksForErrorTest
-{
-    my ($test) = @_;
-
-    my @links = ();
-
-    my $base = stripExtension($test);
-
-    push @links, @{linksForExpectedAndActualResults($base)};
-    push @links, { href => "$base-$errorTag.txt", text => "stderr" };
-
-    return \@links;
-}
-
-sub linksForNewTest
-{
-    my ($test) = @_;
-
-    my @links = ();
-
-    my $base = stripExtension($test);
-
-    my $expectedResultPath = $expectedResultPaths{$base};
-    my ($expectedResultFileName, $expectedResultsDirectory, $expectedResultExtension) = fileparse($expectedResultPath, qr{\.[^.]+$});
-
-    push @links, { href => "$base-$actualTag$expectedResultExtension", text => "result" };
-    if ($pixelTests && $imagesPresent{$base}) {
-        push @links, { href => "$base-$expectedTag.png", text => "image" };
-    }
-
-    return \@links;
-}
-
-sub deleteExpectedAndActualResults($)
-{
-    my ($base) = @_;
-
-    unlink "$testResultsDirectory/$base-$actualTag.txt";
-    unlink "$testResultsDirectory/$base-$diffsTag.txt";
-    unlink "$testResultsDirectory/$base-$errorTag.txt";
-}
-
-sub recordActualResultsAndDiff($$)
-{
-    my ($base, $actualResults) = @_;
-
-    return unless defined($actualResults) && length($actualResults);
-
-    my $expectedResultPath = $expectedResultPaths{$base};
-    my ($expectedResultFileNameMinusExtension, $expectedResultDirectoryPath, $expectedResultExtension) = fileparse($expectedResultPath, qr{\.[^.]+$});
-    my $actualResultsPath = "$testResultsDirectory/$base-$actualTag$expectedResultExtension";
-    my $copiedExpectedResultsPath = "$testResultsDirectory/$base-$expectedTag$expectedResultExtension";
-
-    mkpath(dirname($actualResultsPath));
-    writeToFile("$actualResultsPath", $actualResults);
-
-    if (-f $expectedResultPath) {
-        copy("$expectedResultPath", "$copiedExpectedResultsPath");
-    } else {
-        open EMPTY, ">$copiedExpectedResultsPath";
-        close EMPTY;
-    }
-
-    my $diffOuputBasePath = "$testResultsDirectory/$base";
-    my $diffOutputPath = "$diffOuputBasePath-$diffsTag.txt";
-    system "diff -u \"$copiedExpectedResultsPath\" \"$actualResultsPath\" > \"$diffOutputPath\"";
-
-    my $prettyDiffOutputPath = "$diffOuputBasePath-$prettyDiffTag.html";
-    my $prettyPatchPath = "BugsSite/PrettyPatch/";
-    my $prettifyPath = "$prettyPatchPath/prettify.rb";
-    system "ruby -I \"$prettyPatchPath\" \"$prettifyPath\" \"$diffOutputPath\" > \"$prettyDiffOutputPath\"";
-}
-
-sub buildPlatformResultHierarchy()
-{
-    mkpath($platformTestDirectory) if ($platform eq "undefined" && !-d "$platformTestDirectory");
-
-    my @platforms;
-    if ($platform =~ /^mac-/) {
-        my $i;
-        for ($i = 0; $i < @macPlatforms; $i++) {
-            last if $macPlatforms[$i] eq $platform;
-        }
-        for (; $i < @macPlatforms; $i++) {
-            push @platforms, $macPlatforms[$i];
-        }
-    } elsif ($platform =~ /^qt-/) {
-        push @platforms, $platform;
-        push @platforms, "qt";
-    } else {
-        @platforms = $platform;
-    }
-
-    my @hierarchy;
-    for (my $i = 0; $i < @platforms; $i++) {
-        my $scoped = catdir($platformBaseDirectory, $platforms[$i]);
-        push(@hierarchy, $scoped) if (-d $scoped);
-    }
-
-    return @hierarchy;
-}
-
-sub buildPlatformTestHierarchy(@)
-{
-    my (@platformHierarchy) = @_;
-    return @platformHierarchy if (@platformHierarchy < 2);
-
-    return ($platformHierarchy[0], $platformHierarchy[$#platformHierarchy]);
-}
-
-sub epiloguesAndPrologues($$)
-{
-    my ($lastDirectory, $directory) = @_;
-    my @lastComponents = split('/', $lastDirectory);
-    my @components = split('/', $directory);
-
-    while (@lastComponents) {
-        if (!defined($components[0]) || $lastComponents[0] ne $components[0]) {
-            last;
-        }
-        shift @components;
-        shift @lastComponents;
-    }
-
-    my @result;
-    my $leaving = $lastDirectory;
-    foreach (@lastComponents) {
-        my $epilogue = $leaving . "/resources/run-webkit-tests-epilogue.html";
-        foreach (@platformResultHierarchy) {
-            push @result, catdir($_, $epilogue) if (stat(catdir($_, $epilogue)));
-        }
-        push @result, catdir($testDirectory, $epilogue) if (stat(catdir($testDirectory, $epilogue)));
-        $leaving =~ s|(^\|/)[^/]+$||;
-    }
-
-    my $entering = $leaving;
-    foreach (@components) {
-        $entering .= '/' . $_;
-        my $prologue = $entering . "/resources/run-webkit-tests-prologue.html";
-        push @result, catdir($testDirectory, $prologue) if (stat(catdir($testDirectory, $prologue)));
-        foreach (reverse @platformResultHierarchy) {
-            push @result, catdir($_, $prologue) if (stat(catdir($_, $prologue)));
-        }
-    }
-    return @result;
-}
-    
-sub parseLeaksandPrintUniqueLeaks()
-{
-    return unless @leaksFilenames;
-     
-    my $mergedFilenames = join " ", @leaksFilenames;
-    my $parseMallocHistoryTool = sourceDir() . "/WebKitTools/Scripts/parse-malloc-history";
-    
-    open MERGED_LEAKS, "cat $mergedFilenames | $parseMallocHistoryTool --merge-depth $mergeDepth  - |" ;
-    my @leakLines = <MERGED_LEAKS>;
-    close MERGED_LEAKS;
-    
-    my $uniqueLeakCount = 0;
-    my $totalBytes;
-    foreach my $line (@leakLines) {
-        ++$uniqueLeakCount if ($line =~ /^(\d*)\scalls/);
-        $totalBytes = $1 if $line =~ /^total\:\s(.*)\s\(/;
-    }
-    
-    print "\nWARNING: $totalLeaks total leaks found for a total of $totalBytes!\n";
-    print "WARNING: $uniqueLeakCount unique leaks found!\n";
-    print "See above for individual leaks results.\n" if ($leaksOutputFileNumber > 2);
-    
-}
-
-sub extensionForMimeType($)
-{
-    my ($mimeType) = @_;
-
-    if ($mimeType eq "application/x-webarchive") {
-        return "webarchive";
-    } elsif ($mimeType eq "application/pdf") {
-        return "pdf";
-    }
-    return "txt";
-}
-
-# Read up to the first #EOF (the content block of the test), or until detecting crashes or timeouts.
-sub readFromDumpToolWithTimer(**)
-{
-    my ($fhIn, $fhError) = @_;
-
-    setFileHandleNonBlocking($fhIn, 1);
-    setFileHandleNonBlocking($fhError, 1);
-
-    my $maximumSecondsWithoutOutput = $timeoutSeconds;
-    $maximumSecondsWithoutOutput *= 10 if $guardMalloc;
-    my $microsecondsToWaitBeforeReadingAgain = 1000;
-
-    my $timeOfLastSuccessfulRead = time;
-
-    my @output = ();
-    my @error = ();
-    my $status = "success";
-    my $mimeType = "text/plain";
-    # We don't have a very good way to know when the "headers" stop
-    # and the content starts, so we use this as a hack:
-    my $haveSeenContentType = 0;
-    my $haveSeenEofIn = 0;
-    my $haveSeenEofError = 0;
-
-    while (1) {
-        if (time - $timeOfLastSuccessfulRead > $maximumSecondsWithoutOutput) {
-            $status = dumpToolDidCrash() ? "crashed" : "timedOut";
-            last;
-        }
-
-        # Once we've seen the EOF, we must not read anymore.
-        my $lineIn = readline($fhIn) unless $haveSeenEofIn;
-        my $lineError = readline($fhError) unless $haveSeenEofError;
-        if (!defined($lineIn) && !defined($lineError)) {
-            last if ($haveSeenEofIn && $haveSeenEofError);
-
-            if ($! != EAGAIN) {
-                $status = "crashed";
-                last;
-            }
-
-            # No data ready
-            usleep($microsecondsToWaitBeforeReadingAgain);
-            next;
-        }
-
-        $timeOfLastSuccessfulRead = time;
-
-        if (defined($lineIn)) {
-            if (!$haveSeenContentType && $lineIn =~ /^Content-Type: (\S+)$/) {
-                $mimeType = $1;
-                $haveSeenContentType = 1;
-            } elsif ($lineIn =~ /#EOF/) {
-                $haveSeenEofIn = 1;
-            } else {
-                push @output, $lineIn;
-            }
-        }
-        if (defined($lineError)) {
-            if ($lineError =~ /#EOF/) {
-                $haveSeenEofError = 1;
-            } else {
-                push @error, $lineError;
-            }
-        }
-    }
-
-    setFileHandleNonBlocking($fhIn, 0);
-    setFileHandleNonBlocking($fhError, 0);
-    return {
-        output => join("", @output),
-        error => join("", @error),
-        status => $status,
-        mimeType => $mimeType,
-        extension => extensionForMimeType($mimeType)
-    };
-}
-
-sub setFileHandleNonBlocking(*$)
-{
-    my ($fh, $nonBlocking) = @_;
-
-    my $flags = fcntl($fh, F_GETFL, 0) or die "Couldn't get filehandle flags";
-
-    if ($nonBlocking) {
-        $flags |= O_NONBLOCK;
-    } else {
-        $flags &= ~O_NONBLOCK;
-    }
-
-    fcntl($fh, F_SETFL, $flags) or die "Couldn't set filehandle flags";
-
-    return 1;
-}
-
-sub sampleDumpTool()
-{
-    return unless isAppleMacWebKit();
-    return unless $runSample;
-
-    my $outputDirectory = "$ENV{HOME}/Library/Logs/DumpRenderTree";
-    -d $outputDirectory or mkdir $outputDirectory;
-
-    my $outputFile = "$outputDirectory/HangReport.txt";
-    system "/usr/bin/sample", $dumpToolPID, qw(10 10 -file), $outputFile;
-}
-
-sub stripMetrics($$)
-{
-    my ($actual, $expected) = @_;
-
-    foreach my $result ($actual, $expected) {
-        $result =~ s/at \(-?[0-9]+,-?[0-9]+\) *//g;
-        $result =~ s/size -?[0-9]+x-?[0-9]+ *//g;
-        $result =~ s/text run width -?[0-9]+: //g;
-        $result =~ s/text run width -?[0-9]+ [a-zA-Z ]+: //g;
-        $result =~ s/RenderButton {BUTTON} .*/RenderButton {BUTTON}/g;
-        $result =~ s/RenderImage {INPUT} .*/RenderImage {INPUT}/g;
-        $result =~ s/RenderBlock {INPUT} .*/RenderBlock {INPUT}/g;
-        $result =~ s/RenderTextControl {INPUT} .*/RenderTextControl {INPUT}/g;
-        $result =~ s/\([0-9]+px/px/g;
-        $result =~ s/ *" *\n +" */ /g;
-        $result =~ s/" +$/"/g;
-
-        $result =~ s/- /-/g;
-        $result =~ s/\n( *)"\s+/\n$1"/g;
-        $result =~ s/\s+"\n/"\n/g;
-        $result =~ s/scrollWidth [0-9]+/scrollWidth/g;
-        $result =~ s/scrollHeight [0-9]+/scrollHeight/g;
-    }
-
-    return ($actual, $expected);
-}
-
-sub fileShouldBeIgnored
-{
-    my ($filePath) = @_;
-    foreach my $ignoredDir (keys %ignoredDirectories) {
-        if ($filePath =~ m/^$ignoredDir/) {
-            return 1;
-        }
-    }
+    # Change this check to control which platforms use
+    # new-run-webkit-tests by default.
     return 0;
 }
 
-sub readSkippedFiles($)
-{
-    my ($constraintPath) = @_;
-
-    foreach my $level (@platformTestHierarchy) {
-        if (open SKIPPED, "<", "$level/Skipped") {
-            if ($verbose) {
-                my ($dir, $name) = splitpath($level);
-                print "Skipped tests in $name:\n";
-            }
-
-            while (<SKIPPED>) {
-                my $skipped = $_;
-                chomp $skipped;
-                $skipped =~ s/^[ \n\r]+//;
-                $skipped =~ s/[ \n\r]+$//;
-                if ($skipped && $skipped !~ /^#/) {
-                    if ($skippedOnly) {
-                        if (!fileShouldBeIgnored($skipped)) {
-                            if (!$constraintPath) {
-                                # Always add $skipped since no constraint path was specified on the command line.
-                                push(@ARGV, $skipped);
-                            } elsif ($skipped =~ /^($constraintPath)/) {
-                                # Add $skipped only if it matches the current path constraint, e.g.,
-                                # "--skipped=only dir1" with "dir1/file1.html" on the skipped list.
-                                push(@ARGV, $skipped);
-                            } elsif ($constraintPath =~ /^($skipped)/) {
-                                # Add current path constraint if it is more specific than the skip list entry,
-                                # e.g., "--skipped=only dir1/dir2/dir3" with "dir1" on the skipped list.
-                                push(@ARGV, $constraintPath);
-                            }
-                        } elsif ($verbose) {
-                            print "    $skipped\n";
-                        }
-                    } else {
-                        if ($verbose) {
-                            print "    $skipped\n";
-                        }
-                        processIgnoreTests($skipped, "Skipped");
-                    }
-                }
-            }
-            close SKIPPED;
-        }
-    }
-}
-
-my @testsToRun;
-
-sub directoryFilter
-{
-    return () if exists $ignoredLocalDirectories{basename($File::Find::dir)};
-    return () if exists $ignoredDirectories{File::Spec->abs2rel($File::Find::dir, $testDirectory)};
-    return @_;
-}
-
-sub fileFilter
-{
-    my $filename = $_;
-    if ($filename =~ /\.([^.]+)$/) {
-        if (exists $supportedFileExtensions{$1}) {
-            my $path = File::Spec->abs2rel(catfile($File::Find::dir, $filename), $testDirectory);
-            push @testsToRun, $path if !exists $ignoredFiles{$path};
-        }
-    }
-}
-
-sub findTestsToRun
-{
-    @testsToRun = ();
-
-    for my $test (@ARGV) {
-        $test =~ s/^($layoutTestsName|$testDirectory)\///;
-        my $fullPath = catfile($testDirectory, $test);
-        if (file_name_is_absolute($test)) {
-            print "can't run test $test outside $testDirectory\n";
-        } elsif (-f $fullPath) {
-            my ($filename, $pathname, $fileExtension) = fileparse($test, qr{\.[^.]+$});
-            if (!exists $supportedFileExtensions{substr($fileExtension, 1)}) {
-                print "test $test does not have a supported extension\n";
-            } elsif ($testHTTP || $pathname !~ /^http\//) {
-                push @testsToRun, $test;
-            }
-        } elsif (-d $fullPath) {
-            find({ preprocess => \&directoryFilter, wanted => \&fileFilter }, $fullPath);
-            for my $level (@platformTestHierarchy) {
-                my $platformPath = catfile($level, $test);
-                find({ preprocess => \&directoryFilter, wanted => \&fileFilter }, $platformPath) if (-d $platformPath);
-            }
-        } else {
-            print "test $test not found\n";
-        }
-    }
-
-    if (!scalar @ARGV) {
-        find({ preprocess => \&directoryFilter, wanted => \&fileFilter }, $testDirectory);
-        for my $level (@platformTestHierarchy) {
-            find({ preprocess => \&directoryFilter, wanted => \&fileFilter }, $level);
-        }
-    }
-
-    # Remove duplicate tests
-    @testsToRun = keys %{{ map { $_ => 1 } @testsToRun }};
+my $harnessName = "old-run-webkit-tests";
 
-    @testsToRun = sort pathcmp @testsToRun;
-
-    # We need to minimize the time when Apache and WebSocketServer is locked by tests
-    # so run them last if no explicit order was specified in the argument list.
-    if (!scalar @ARGV) {
-        my @httpTests;
-        my @websocketTests;
-        my @otherTests;
-        foreach my $test (@testsToRun) {
-            if ($test =~ /^http\//) {
-                push(@httpTests, $test);
-            } elsif ($test =~ /^websocket\//) {
-                push(@websocketTests, $test);
-            } else {
-                push(@otherTests, $test);
-            }
-        }
-        @testsToRun = (@otherTests, @httpTests, @websocketTests);
+if (useNewRunWebKitTests()) {
+    $harnessName = "new-run-webkit-tests";
+    if (runningOnBuildBot()) {
+        push(@ARGV, "--verbose");
+        # old-run-webkit-tests treats --results-directory as $CWD relative.
+        # new-run-webkit-tests treats --results-directory as build directory relative.
+        # Override the passed in --results-directory by appending a new one
+        # (later arguments override earlier ones in Python's optparse).
+        push(@ARGV, "--results-directory");
+        # The buildbot always uses $SRCDIR/layout-test-results, hardcode it:
+        push(@ARGV, sourceDir() . "/layout-test-results");
     }
-
-    # Reverse the tests
-    @testsToRun = reverse @testsToRun if $reverseTests;
-
-    # Shuffle the array
-    @testsToRun = shuffle(@testsToRun) if $randomizeTests;
-
-    return @testsToRun;
 }
 
-sub printResults
-{
-    my %text = (
-        match => "succeeded",
-        mismatch => "had incorrect layout",
-        new => "were new",
-        timedout => "timed out",
-        crash => "crashed",
-        error => "had stderr output"
-    );
-
-    for my $type ("match", "mismatch", "new", "timedout", "crash", "error") {
-        my $typeCount = $counts{$type};
-        next unless $typeCount;
-        my $typeText = $text{$type};
-        my $message;
-        if ($typeCount == 1) {
-            $typeText =~ s/were/was/;
-            $message = sprintf "1 test case (%d%%) %s\n", 1 * 100 / $count, $typeText;
-        } else {
-            $message = sprintf "%d test cases (%d%%) %s\n", $typeCount, $typeCount * 100 / $count, $typeText;
-        }
-        $message =~ s-\(0%\)-(<1%)-;
-        print $message;
-    }
-}
+my $harnessPath = sprintf("%s/%s", relativeScriptsDir(), $harnessName);
+exec $harnessPath ($harnessPath, @ARGV) or die "Failed to execute $harnessPath";
author	Steve Block <steveblock@google.com>	2010-04-27 16:31:00 +0100
committer	Steve Block <steveblock@google.com>	2010-05-11 14:42:12 +0100
commit	dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch)
tree	92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKitTools/Scripts/run-webkit-tests
parent	ccac38a6b48843126402088a309597e682f40fe6 (diff)
download	external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2