Changeset 98801 in webkit

Timestamp:

Oct 29, 2011 1:21:28 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r98780.
​http://trac.webkit.org/changeset/98780
​https://bugs.webkit.org/show_bug.cgi?id=71173

Broke Qt bots (Requested by rniwa on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-10-29

• Scripts/run-webkit-tests:

(useNewRunWebKitTests):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webkit-tests (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-29  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r98780.
+        http://trac.webkit.org/changeset/98780
+        https://bugs.webkit.org/show_bug.cgi?id=71173
+
+        Broke Qt bots (Requested by rniwa on #webkit).
+
+        * Scripts/run-webkit-tests:
+        (useNewRunWebKitTests):
+
 2011-10-28  Rafael Weinstein  <rafaelw@chromium.org>
 

trunk/Tools/Scripts/run-webkit-tests

@@ -58 +58 @@
 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;
-}
 
-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.
+    # 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());
+    }
 
-    # 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;
+    return (isLeopard() or isSnowLeopard() or isLion() or isGtk());
 }
 
@@ -86 +81 @@
     $harnessName = "new-run-webkit-tests";
 
-    if (!grep(/--child-processes/, @ARGV) and !platformIsReadyForParallelTesting()) {
+    if (!grep(/--child-processes/, @ARGV)) {
         push(@ARGV, "--child-processes=1");
         print "Running new-run-webkit-tests with one child process.\n";
@@ -97 +92 @@
 }
 
+# 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.