From 2ec98848e2388ac3d612212ad100b0588d50a810 Mon Sep 17 00:00:00 2001
From: Christian Holler <choller@mozilla.com>
Date: Thu, 14 Nov 2013 01:44:41 +0100
Subject: [PATCH] Bug 934641 - Switch ASan tests to using the low-memory config
 instead of the mid-memory config, to work around intermittent OOM failures,
 r=philor

---
 build/automation.py.in   | 13 +++----------
 build/automationutils.py | 13 +++----------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/build/automation.py.in b/build/automation.py.in
index 08763895331..61625e59c3f 100644
--- a/build/automation.py.in
+++ b/build/automation.py.in
@@ -521,19 +521,12 @@ class Automation(object):
       try:
         totalMemory = int(os.popen("free").readlines()[1].split()[1])
 
-        # Only 2 GB RAM or less available? Use custom ASan options to reduce
+        # Only 4 GB RAM or less available? Use custom ASan options to reduce
         # the amount of resources required to do the tests. Standard options 
         # will otherwise lead to OOM conditions on the current test slaves.
-        # 
-        # If we have more than 2 GB or RAM but still less than 4 GB, we need
-        # another set of options to prevent OOM in some memory-intensive
-        # tests.
-        if totalMemory <= 1024 * 1024 * 2:
+        if totalMemory <= 1024 * 1024 * 4:
           self.log.info("INFO | automation.py | ASan running in low-memory configuration")
-          env["ASAN_OPTIONS"] = "quarantine_size=50331648:redzone=64"
-        elif totalMemory <= 1024 * 1024 * 4:
-          self.log.info("INFO | automation.py | ASan running in mid-memory configuration")
-          env["ASAN_OPTIONS"] = "quarantine_size=100663296:redzone=64"
+          env["ASAN_OPTIONS"] = "quarantine_size=50331648"
         else:
           self.log.info("INFO | automation.py | ASan running in default memory configuration")
       except OSError,err:
diff --git a/build/automationutils.py b/build/automationutils.py
index 43e04a82997..7cf803889bc 100644
--- a/build/automationutils.py
+++ b/build/automationutils.py
@@ -457,20 +457,13 @@ def environment(xrePath, env=None, crashreporter=True):
 
       totalMemory = systemMemory()
 
-      # Only 2 GB RAM or less available? Use custom ASan options to reduce
+      # Only 4 GB RAM or less available? Use custom ASan options to reduce
       # the amount of resources required to do the tests. Standard options
       # will otherwise lead to OOM conditions on the current test slaves.
-      #
-      # If we have more than 2 GB or RAM but still less than 4 GB, we need
-      # another set of options to prevent OOM in some memory-intensive
-      # tests.
       message = "INFO | runtests.py | ASan running in %s configuration"
-      if totalMemory <= 1024 * 1024 * 2:
+      if totalMemory <= 1024 * 1024 * 4:
         message = message % 'low-memory'
-        env["ASAN_OPTIONS"] = "quarantine_size=50331648:redzone=64"
-      elif totalMemory <= 1024 * 1024 * 4:
-        message = message % 'mid-memory'
-        env["ASAN_OPTIONS"] = "quarantine_size=80530636:redzone=64"
+        env["ASAN_OPTIONS"] = "quarantine_size=50331648"
       else:
         message = message % 'default memory'
     except OSError,err: