mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 977921 - Override ASan malloc_context_size to save memory. r=decoder
--HG-- extra : rebase_source : 500882c214de079c1d493e21a9ee91c3da743226
This commit is contained in:
parent
9f44a4933c
commit
5ae1515090
@ -533,7 +533,7 @@ class Automation(object):
|
||||
# will otherwise lead to OOM conditions on the current test slaves.
|
||||
if totalMemory <= 1024 * 1024 * 4:
|
||||
self.log.info("INFO | automation.py | ASan running in low-memory configuration")
|
||||
env["ASAN_OPTIONS"] = "quarantine_size=50331648"
|
||||
env["ASAN_OPTIONS"] = "quarantine_size=50331648:malloc_context_size=5"
|
||||
else:
|
||||
self.log.info("INFO | automation.py | ASan running in default memory configuration")
|
||||
except OSError,err:
|
||||
|
@ -479,7 +479,7 @@ def environment(xrePath, env=None, crashreporter=True, debugger=False, dmdPath=N
|
||||
message = "INFO | runtests.py | ASan running in %s configuration"
|
||||
if totalMemory <= 1024 * 1024 * 4:
|
||||
message = message % 'low-memory'
|
||||
env["ASAN_OPTIONS"] = "quarantine_size=50331648"
|
||||
env["ASAN_OPTIONS"] = "quarantine_size=50331648:malloc_context_size=5"
|
||||
else:
|
||||
message = message % 'default memory'
|
||||
except OSError,err:
|
||||
|
@ -152,7 +152,7 @@ class MochitestServer(object):
|
||||
# thus consuming too much resources when running together with the browser on
|
||||
# the test slaves. Try to limit the amount of resources by disabling certain
|
||||
# features.
|
||||
env["ASAN_OPTIONS"] = "quarantine_size=1:redzone=32"
|
||||
env["ASAN_OPTIONS"] = "quarantine_size=1:redzone=32:malloc_context_size=5"
|
||||
|
||||
if mozinfo.isWin:
|
||||
env["PATH"] = env["PATH"] + ";" + str(self._xrePath)
|
||||
|
Loading…
Reference in New Issue
Block a user