Title: [90213] trunk/Tools
- Revision
- 90213
- Author
- [email protected]
- Date
- 2011-07-01 00:31:36 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Eric Seidel <[email protected]>
Reviewed by Adam Barth.
Switch Snow Leopard over to new-run-webkit-tests (except for wk2)
https://bugs.webkit.org/show_bug.cgi?id=63786
We're down to one bug blocking the "move to NRWT" bug:
https://bugs.webkit.org/show_bug.cgi?id=34984
so we're trying transitioning Snow Leopard to NRWT as an experiment.
If we run into any blocking issues we'll of course roll this back out
(or anyone reading this should feel encouraged to).
* Scripts/run-webkit-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90212 => 90213)
--- trunk/Tools/ChangeLog 2011-07-01 07:28:11 UTC (rev 90212)
+++ trunk/Tools/ChangeLog 2011-07-01 07:31:36 UTC (rev 90213)
@@ -1,3 +1,19 @@
+2011-07-01 Eric Seidel <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ Switch Snow Leopard over to new-run-webkit-tests (except for wk2)
+ https://bugs.webkit.org/show_bug.cgi?id=63786
+
+ We're down to one bug blocking the "move to NRWT" bug:
+ https://bugs.webkit.org/show_bug.cgi?id=34984
+ so we're trying transitioning Snow Leopard to NRWT as an experiment.
+
+ If we run into any blocking issues we'll of course roll this back out
+ (or anyone reading this should feel encouraged to).
+
+ * Scripts/run-webkit-tests:
+
2011-07-01 Sheriff Bot <[email protected]>
Unreviewed, rolling out r90192.
Modified: trunk/Tools/Scripts/run-webkit-tests (90212 => 90213)
--- trunk/Tools/Scripts/run-webkit-tests 2011-07-01 07:28:11 UTC (rev 90212)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-07-01 07:31:36 UTC (rev 90213)
@@ -55,28 +55,32 @@
return $isBuildBotUser{$ENV{"USER"}};
}
+sub usingWebKit2()
+{
+ # If either -2 or --webkit-test-runner is passed, we're supposed to use WebKit2.
+ # NRWT's WebKit2 support is still a work in progress:
+ # https://bugs.webkit.org/show_bug.cgi?id=56729
+ return grep(/(-2|--webkit-test-runner)/, @ARGV);
+}
+
sub useNewRunWebKitTests()
{
# Change this check to control which platforms use
# new-run-webkit-tests by default.
# Example: return runningOnBuildBot() && isLeopard();
# would enable new-run-webkit-tests on only the leopard buildbots.
- return 0;
+ return (isSnowLeopard() and !usingWebKit2());
}
my $harnessName = "old-run-webkit-tests";
if (useNewRunWebKitTests()) {
$harnessName = "new-run-webkit-tests";
+ push(@ARGV, "--child-processes=1");
+ print "Running new-run-webkit-tests with one child process.\n";
+ print "For more parallelism, run new-run-webkit-tests directly.\n";
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");
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
