Back out de84b1059f7f (bug 1299871) because it doesn't help the issue it was supposed to.
authorAndrew McCreight <amccreight@mozilla.com>
Wed, 07 Sep 2016 11:09:15 -0700
changeset 313080 ebe49166a751e564fc75a080fc25c4433266c52e
parent 313079 b0c4d7caec6f3941a1d273c82b090153ee278760
child 313081 ff96cb069ef2ca380d679b9b9a7dd2f7d4919d2e
push id20479
push userkwierso@gmail.com
push dateThu, 08 Sep 2016 01:08:46 +0000
treeherderfx-team@fb7c6b034329 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1299871
milestone51.0a1
backs outde84b1059f7f510526debc5b7a0236bfb883de71
Back out de84b1059f7f (bug 1299871) because it doesn't help the issue it was supposed to.
testing/mochitest/mochitest_options.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -772,21 +772,16 @@ class MochitestArguments(ArgumentContain
 
         options.leakThresholds = {
             "default": options.defaultLeakThreshold,
             "tab": 10000,  # See dependencies of bug 1051230.
             # GMP rarely gets a log, but when it does, it leaks a little.
             "geckomediaplugin": 20000,
         }
 
-        # Bug 1293324 - OSX 10.10 sometimes leaks a little more
-        # graphics layers stuff in the content process.
-        if mozinfo.isMac:
-            options.leakThresholds["tab"] = 12000
-
         # XXX We can't normalize test_paths in the non build_obj case here,
         # because testRoot depends on the flavor, which is determined by the
         # mach command and therefore not finalized yet. Conversely, test paths
         # need to be normalized here for the mach case.
         if options.test_paths and build_obj:
             # Normalize test paths so they are relative to test root
             options.test_paths = [build_obj._wrap_path_argument(p).relpath()
                                   for p in options.test_paths]