Bug 1619837 - Eliminate use of `fix_{linux,macosx}_stack.py` in `utils.py`. r=gsvelto
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 12 Mar 2020 00:58:34 +0000
changeset 518286 a780a89ed13f78cd89b3c200f6a5d91723a04f73
parent 518285 e5cd778db960970ddccbca5e1f016eb18d815125
child 518287 3552ac882d4f1a04b714f1d8e500c26db4f2df7e
push id37207
push useropoprus@mozilla.com
push dateThu, 12 Mar 2020 09:33:12 +0000
treeherdermozilla-central@ffd615bf92dd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgsvelto
bugs1619837
milestone76.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
Bug 1619837 - Eliminate use of `fix_{linux,macosx}_stack.py` in `utils.py`. r=gsvelto Because `fix_stacks.py` is faster and cross-platform. Differential Revision: https://phabricator.services.mozilla.com/D65679
testing/mozbase/mozrunner/mozrunner/utils.py
--- a/testing/mozbase/mozrunner/mozrunner/utils.py
+++ b/testing/mozbase/mozrunner/mozrunner/utils.py
@@ -254,32 +254,20 @@ def get_stack_fixer_function(utilityPath
         # This method is preferred for Tinderbox builds, since native
         # symbols may have been stripped.
         stack_fixer_module = import_stack_fixer_module(
             'fix_stack_using_bpsyms')
 
         def stack_fixer_function(line):
             return stack_fixer_module.fixSymbols(line, symbolsPath)
 
-    elif mozinfo.isMac:
-        # Run each line through fix_macosx_stack.py (uses atos).
-        # This method is preferred for developer machines, so we don't
-        # have to run "make buildsymbols".
-        stack_fixer_module = import_stack_fixer_module(
-            'fix_macosx_stack')
-
-        def stack_fixer_function(line):
-            return stack_fixer_module.fixSymbols(line)
-
-    elif mozinfo.isLinux:
-        # Run each line through fix_linux_stack.py (uses addr2line).
-        # This method is preferred for developer machines, so we don't
-        # have to run "make buildsymbols".
-        stack_fixer_module = import_stack_fixer_module(
-            'fix_linux_stack')
+    elif mozinfo.isLinux or mozinfo.isMac or mozinfo.isWin:
+        # Run each line through fix_stacks.py. This method is preferred for
+        # developer machines, so we don't have to run "mach buildsymbols".
+        stack_fixer_module = import_stack_fixer_module('fix_stacks')
 
         def stack_fixer_function(line):
             return stack_fixer_module.fixSymbols(line)
 
     else:
         return None
 
     return stack_fixer_function