Backed out changeset 824144dd7cdf (bug 1039633) for OSX build errors
authorWes Kocher <wkocher@mozilla.com>
Thu, 28 Aug 2014 15:47:01 -0700
changeset 202292 3ea1bc86f28c7ca79ed7bd5577188e34dc33b40f
parent 202291 bbb7d48bfea8e6748ab41a032561fde6aa06f749
child 202293 6f88f594ec269ed63999617d783fa3224a5bcd97
push id48380
push userkwierso@gmail.com
push dateThu, 28 Aug 2014 22:47:28 +0000
treeherdermozilla-inbound@3ea1bc86f28c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1039633
milestone34.0a1
backs out824144dd7cdf68bffa02360f042d4aa1533e7c59
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
Backed out changeset 824144dd7cdf (bug 1039633) for OSX build errors
testing/gtest/rungtests.py
--- a/testing/gtest/rungtests.py
+++ b/testing/gtest/rungtests.py
@@ -25,17 +25,16 @@ class GTests(object):
         * prog: The path to the test program to run.
         * env: The environment to use for running the program.
         * symbols_path: A path to a directory containing Breakpad-formatted
                         symbol files for producing stack traces on crash.
 
         Return True if the program exits with a zero status, False otherwise.
         """
         self.xre_path = xre_path
-        self.update_mozinfo()
         env = self.build_environment()
         log.info("Running gtest")
         proc = mozprocess.ProcessHandler([prog, "-unittest"],
                                          cwd=os.getcwd(),
                                          env=env)
         #TODO: After bug 811320 is fixed, don't let .run() kill the process,
         # instead use a timeout in .wait() and then kill to get a stack.
         proc.run(timeout=GTests.TEST_PROC_TIMEOUT,
@@ -84,42 +83,29 @@ class GTests(object):
             pathvar = "PATH"
         if pathvar:
             if pathvar in env:
                 env[pathvar] = "%s%s%s" % (self.xre_path, os.pathsep, env[pathvar])
             else:
                 env[pathvar] = self.xre_path
 
         # ASan specific environment stuff
-        asan = bool(mozinfo.info.get("asan"))
-        if asan and (mozinfo.isLinux or mozinfo.isMac):
+        # mozinfo is not set up properly to detect if ASan is enabled, so just always set these.
+        if mozinfo.isLinux or mozinfo.isMac:
             # Symbolizer support
             llvmsym = os.path.join(self.xre_path, "llvm-symbolizer")
             if os.path.isfile(llvmsym):
                 env["ASAN_SYMBOLIZER_PATH"] = llvmsym
                 log.info("gtest | ASan using symbolizer at %s", llvmsym)
             else:
-                log.testFail("gtest | Failed to find ASan symbolizer at %s", llvmsym)
+                # This should be |testFail| instead of |info|. See bug 1050891.
+                log.info("gtest | Failed to find ASan symbolizer at %s", llvmsym)
 
         return env
 
-    def update_mozinfo(self):
-        """walk up directories to find mozinfo.json update the info"""
-        # TODO: This should go in a more generic place, e.g. mozinfo
-
-        path = self.xre_path
-        dirs = set()
-        while path != os.path.expanduser('~'):
-            if path in dirs:
-                break
-            dirs.add(path)
-            path = os.path.split(path)[0]
-
-        mozinfo.find_and_update_from_json(*dirs)
-
 class gtestOptions(OptionParser):
     def __init__(self):
         OptionParser.__init__(self)
         self.add_option("--xre-path",
                         action = "store", type = "string", dest = "xre_path",
                         default = None,
                         help = "absolute path to directory containing XRE (probably xulrunner)")
         self.add_option("--symbols-path",