Merge WebKit at r84325: Initial merge by git.

Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b

1 files changed, 4 insertions, 14 deletions

diff --git a/Tools/Scripts/webkitpy/tool/steps/runtests.py b/Tools/Scripts/webkitpy/tool/steps/runtests.py
index 282e381..793a94b 100644
--- a/Tools/Scripts/webkitpy/tool/steps/runtests.py
+++ b/Tools/Scripts/webkitpy/tool/steps/runtests.py
@@ -31,6 +31,9 @@ from webkitpy.tool.steps.options import Options
 from webkitpy.common.system.deprecated_logging import log
 
 class RunTests(AbstractStep):
+    # FIXME: This knowledge really belongs in the commit-queue.
+    NON_INTERACTIVE_FAILURE_LIMIT_COUNT = 10
+
     @classmethod
     def options(cls):
         return AbstractStep.options() + [
@@ -59,21 +62,8 @@ class RunTests(AbstractStep):
         if self._options.non_interactive:
             args.append("--no-new-test-results")
             args.append("--no-launch-safari")
-            args.append("--exit-after-n-failures=1")
+            args.append("--exit-after-n-failures=%s" % self.NON_INTERACTIVE_FAILURE_LIMIT_COUNT)
             args.append("--wait-for-httpd")
-            # FIXME: Hack to work around https://bugs.webkit.org/show_bug.cgi?id=38912
-            # when running the commit-queue on a mac leopard machine since compositing
-            # does not work reliably on Leopard due to various graphics driver/system bugs.
-            if self._tool.port().name() == "Mac" and self._tool.port().is_leopard():
-                tests_to_ignore = []
-                tests_to_ignore.append("compositing")
-
-                # media tests are also broken on mac leopard due to
-                # a separate CoreVideo bug which causes random crashes/hangs
-                # https://bugs.webkit.org/show_bug.cgi?id=38912
-                tests_to_ignore.append("media")
-
-                args.extend(["--ignore-tests", ",".join(tests_to_ignore)])
 
         if self._options.quiet:
             args.append("--quiet")