Bug 1790905 - Respect ASAN_SYMBOLIZER_PATH when running asan cppunit/xpcshell/gtests; r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D157751

Author: gbrownmozilla

testing/gtest/rungtests.py

@@ -157,9 +157,14 @@ def build_environment(self):
         # ASan specific environment stuff
         if mozinfo.info["asan"]:
             # Symbolizer support
-            llvmsym = os.path.join(
-                self.xre_path, "llvm-symbolizer" + mozinfo.info["bin_suffix"]
-            )
+            if "ASAN_SYMBOLIZER_PATH" in env and os.path.isfile(
+                env["ASAN_SYMBOLIZER_PATH"]
+            ):
+                llvmsym = env["ASAN_SYMBOLIZER_PATH"]
+            else:
+                llvmsym = os.path.join(
+                    self.xre_path, "llvm-symbolizer" + mozinfo.info["bin_suffix"]
+                )
             if os.path.isfile(llvmsym):
                 env["ASAN_SYMBOLIZER_PATH"] = llvmsym
                 log.info("gtest | ASan using symbolizer at %s", llvmsym)

testing/runcppunittests.py

@@ -145,9 +145,14 @@ def build_environment(self):
 
         if mozinfo.info["asan"]:
             # Use llvm-symbolizer for ASan if available/required
-            llvmsym = os.path.join(
-                self.xre_path, "llvm-symbolizer" + mozinfo.info["bin_suffix"]
-            )
+            if "ASAN_SYMBOLIZER_PATH" in env and os.path.isfile(
+                env["ASAN_SYMBOLIZER_PATH"]
+            ):
+                llvmsym = env["ASAN_SYMBOLIZER_PATH"]
+            else:
+                llvmsym = os.path.join(
+                    self.xre_path, "llvm-symbolizer" + mozinfo.info["bin_suffix"]
+                )
             if os.path.isfile(llvmsym):
                 env["ASAN_SYMBOLIZER_PATH"] = llvmsym
                 self.log.info("ASan using symbolizer at %s" % llvmsym)

testing/xpcshell/runxpcshelltests.py

@@ -1260,9 +1260,14 @@ def buildEnvironment(self):
         usingTSan = "tsan" in self.mozInfo and self.mozInfo["tsan"]
         if usingASan or usingTSan:
             # symbolizer support
-            llvmsym = os.path.join(
-                self.xrePath, "llvm-symbolizer" + self.mozInfo["bin_suffix"]
-            )
+            if "ASAN_SYMBOLIZER_PATH" in self.env and os.path.isfile(
+                self.env["ASAN_SYMBOLIZER_PATH"]
+            ):
+                llvmsym = self.env["ASAN_SYMBOLIZER_PATH"]
+            else:
+                llvmsym = os.path.join(
+                    self.xrePath, "llvm-symbolizer" + self.mozInfo["bin_suffix"]
+                )
             if os.path.isfile(llvmsym):
                 if usingASan:
                     self.env["ASAN_SYMBOLIZER_PATH"] = llvmsym