Merge b2g-inbound to m-c. a=merge
authorRyan VanderMeulen <ryanvm@gmail.com>
Fri, 08 Aug 2014 21:07:08 -0400
changeset 198650 5a7ddc177051e7cce5a9e096bd5e100a9aeb1823
parent 198647 2a621e79e6b9b6d416df90bef0896f2a699c0c03 (current diff)
parent 198649 5c5bd5027f00a4f2ce86f2198359b015ddb25b4f (diff)
child 198661 83f519eb1a3a0d6a7a2c2adce631c086d8112836
push id27280
push userryanvm@gmail.com
push dateSat, 09 Aug 2014 01:45:22 +0000
treeherdermozilla-central@83f519eb1a3a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone34.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge b2g-inbound to m-c. a=merge
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -751,17 +751,17 @@ class B2GOptions(MochitestOptions):
         defaults["httpPort"] = DEFAULT_PORTS['http']
         defaults["sslPort"] = DEFAULT_PORTS['https']
         defaults["logFile"] = "mochitest.log"
         defaults["autorun"] = True
         defaults["closeWhenDone"] = True
         defaults["testPath"] = ""
         defaults["extensionsToExclude"] = ["specialpowers"]
         # See dependencies of bug 1038943.
-        defaults["leakThreshold"] = 4991
+        defaults["leakThreshold"] = 4727
         self.set_defaults(**defaults)
 
     def verifyRemoteOptions(self, options):
         if options.remoteWebServer == None:
             if os.name != "nt":
                 options.remoteWebServer = moznetwork.get_ip()
             else:
                 self.error("You must specify a --remote-webserver=<ip address>")