Title: [98804] trunk/Tools
- Revision
- 98804
- Author
- kbal...@webkit.org
- Date
- 2011-10-29 07:45:23 -0700 (Sat, 29 Oct 2011)
Log Message
new-run-webkit-tests: MASTER BUG: Switch all webkit.org bots over
https://bugs.webkit.org/show_bug.cgi?id=34984
Patch by Eric Seidel <e...@webkit.org> on 2011-10-29
Reviewed by Adam Barth.
Move run-webkit-tests from using a white-list of supported NRWT ports
to a blacklist of ports requiring ORWT.
I've also added the ability to opt-in to parallel testing on a per-port basis.
With these changes I'm going to officially declare this bug dead and
work on remaining polish issues and individual developer complaints.
* Scripts/run-webkit-tests:
(useNewRunWebKitTests):
(platformIsReadyForParallelTesting):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (98803 => 98804)
--- trunk/Tools/ChangeLog 2011-10-29 09:36:12 UTC (rev 98803)
+++ trunk/Tools/ChangeLog 2011-10-29 14:45:23 UTC (rev 98804)
@@ -1,3 +1,22 @@
+2011-10-29 Eric Seidel <e...@webkit.org>
+
+ new-run-webkit-tests: MASTER BUG: Switch all webkit.org bots over
+ https://bugs.webkit.org/show_bug.cgi?id=34984
+
+ Reviewed by Adam Barth.
+
+ Move run-webkit-tests from using a white-list of supported NRWT ports
+ to a blacklist of ports requiring ORWT.
+
+ I've also added the ability to opt-in to parallel testing on a per-port basis.
+
+ With these changes I'm going to officially declare this bug dead and
+ work on remaining polish issues and individual developer complaints.
+
+ * Scripts/run-webkit-tests:
+ (useNewRunWebKitTests):
+ (platformIsReadyForParallelTesting):
+
2011-10-29 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r98780.
Modified: trunk/Tools/Scripts/run-webkit-tests (98803 => 98804)
--- trunk/Tools/Scripts/run-webkit-tests 2011-10-29 09:36:12 UTC (rev 98803)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-10-29 14:45:23 UTC (rev 98804)
@@ -57,22 +57,27 @@
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.
-
- # Note: We use a whitelist here to avoid calling isPORT() for ports
- # for which we haven't explicitly added support. Calling isPORT()
- # will remove the --PORT argument from @ARGV, causing us to fail to pass it to the test harness.
-
# NRWT Windows support still needs work: https://bugs.webkit.org/show_bug.cgi?id=38756
+ return 0 if isWindows() or isCygwin();
+ # NRWT does not support qt-arm: https://bugs.webkit.org/show_bug.cgi?id=64086
+ return 0 if isQt() and isARM();
+ # All other platforms should use NRWT by default.
+ return 1;
+}
- # NRWT doesn't support qt-arm and qt-4.8 platforms now: https://bugs.webkit.org/show_bug.cgi?id=64071 and https://bugs.webkit.org/show_bug.cgi?id=64086
- if (isQt()) {
- return (!isARM());
- }
+sub platformIsReadyForParallelTesting()
+{
+ # NRWT is able to run the tests in parallel, ORWT was not.
+ # When we run the tests in parallel, tests which (incorrectly)
+ # interact with each other can start failing.
+ # To reduce the failure burden during the transition individual
+ # platforms can opt-in to parallel test execution by default.
- return (isLeopard() or isSnowLeopard() or isLion() or isGtk());
+ # Platforms interested in dog-fooding faster test runs on their bots
+ # should add themselves to this blacklist, e.g.:
+ # return isGtk() or isQt();
+ # This will likely require skipping tests or marking tests as flaky in test_expectations.txt
+ return 0;
}
my $harnessName = "old-run-webkit-tests";
@@ -80,7 +85,7 @@
if (useNewRunWebKitTests()) {
$harnessName = "new-run-webkit-tests";
- if (!grep(/--child-processes/, @ARGV)) {
+ if (!grep(/--child-processes/, @ARGV) and !platformIsReadyForParallelTesting()) {
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";
@@ -91,7 +96,6 @@
}
}
-# FIXME: We need a cleaner way to do --platform handling.
# webkitdirs.pm strips --qt and --gtk from @ARGV when we call isQt/isGtk.
# We have to add back any --PORT arguments which may have been removed by isPort() checks above.
if (isQt()) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
