Bug 1299871 - Increase leak threshold on OS X to paper over increased layers leak. r=erahm
authorAndrew McCreight <continuation@gmail.com>
Thu, 01 Sep 2016 11:04:09 -0700
changeset 312340 de84b1059f7f510526debc5b7a0236bfb883de71
parent 312339 d819b0431209e9d04110d3d385c1edb34b390fb9
child 312359 01b5da819a7c9281b00d3f2cb0959713b3078580
push id20447
push userkwierso@gmail.com
push dateFri, 02 Sep 2016 20:36:44 +0000
treeherderfx-team@969397f22187 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserahm
bugs1299871
milestone51.0a1
Bug 1299871 - Increase leak threshold on OS X to paper over increased layers leak. r=erahm MozReview-Commit-ID: 2QQa5uxmO5J
testing/mochitest/mochitest_options.py
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -772,16 +772,21 @@ 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]