Changeset 98074 in webkit

Timestamp:

Oct 20, 2011 11:49:08 PM (13 years ago)

Author:

eric@webkit.org

Message:

Switch webkit2 bot to NRWT
​https://bugs.webkit.org/show_bug.cgi?id=56729

Reviewed by Adam Barth.

Move the WK2 bot to using NRWT instead of ORWT, as announced on webkit-dev:
​https://lists.webkit.org/pipermail/webkit-dev/2011-October/018337.html

• Scripts/run-webkit-tests:

(runningOnBuildBot):
(useNewRunWebKitTests):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-20  Eric Seidel  <eric@webkit.org>
+
+        Switch webkit2 bot to NRWT
+        https://bugs.webkit.org/show_bug.cgi?id=56729
+
+        Reviewed by Adam Barth.
+
+        Move the WK2 bot to using NRWT instead of ORWT, as announced on webkit-dev:
+        https://lists.webkit.org/pipermail/webkit-dev/2011-October/018337.html
+
+        * Scripts/run-webkit-tests:
+        (runningOnBuildBot):
+        (useNewRunWebKitTests):
+
 2011-10-20  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/run-webkit-tests

@@ -56 +56 @@
 }
 
-# We could use isWebKit2() instead of our own custom usingWebKit2(), but then
-# we'd have to be careful to add -2 or --webkit-test-runner back into @ARGV below.
-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 usingLeaks()
 {
@@ -91 +81 @@
     }
 
-    return ((isLeopard() or isSnowLeopard() or isLion() or isGtk()) and !usingWebKit2() and !usingLeaks());
+    return ((isLeopard() or isSnowLeopard() or isLion() or isGtk()) and !usingLeaks());
 }