Backout 6f35795603f7 from bug 1069568 as it's no longer needed.
authorStephen Pohl <spohl.mozilla.bugs@gmail.com>
Mon, 29 Sep 2014 14:44:19 -0400
changeset 491297 a99dd012283f80d5840ec5ac0a11e1fc63124474
parent 491296 2d7fc305953f13756ec498f237c5e2eb28b73d49
child 491298 79f6dc04c45a4491b09d0b1a15660def6b162ffd
push id47343
push userbmo:dothayer@mozilla.com
push dateWed, 01 Mar 2017 22:58:58 +0000
bugs1069568
milestone35.0a1
backs out6f35795603f7a9e80049d0c4dfb61af90b208069
Backout 6f35795603f7 from bug 1069568 as it's no longer needed.
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1934,38 +1934,38 @@ class Mochitest(MochitestUtilsMixin):
       return stackFixerFunction, if any, to use on the output lines
       """
 
       if not mozinfo.info.get('debug'):
         return None
 
       stackFixerFunction = None
 
-      def import_stackFixerModule(module_name, module_path):
-        sys.path.insert(0, module_path)
+      def import_stackFixerModule(module_name):
+        sys.path.insert(0, self.utilityPath)
         module = __import__(module_name, globals(), locals(), [])
         sys.path.pop(0)
         return module
 
       if self.symbolsPath and os.path.exists(self.symbolsPath):
         # Run each line through a function in fix_stack_using_bpsyms.py (uses breakpad symbol files).
         # This method is preferred for Tinderbox builds, since native symbols may have been stripped.
-        stackFixerModule = import_stackFixerModule('fix_stack_using_bpsyms', self.utilityPath)
+        stackFixerModule = import_stackFixerModule('fix_stack_using_bpsyms')
         stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line, self.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".
-        stackFixerModule = import_stackFixerModule('fix_macosx_stack', os.path.join(os.path.dirname(self.utilityPath), 'Resources'))
+        stackFixerModule = import_stackFixerModule('fix_macosx_stack')
         stackFixerFunction = lambda line: stackFixerModule.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".
-        stackFixerModule = import_stackFixerModule('fix_linux_stack', self.utilityPath)
+        stackFixerModule = import_stackFixerModule('fix_linux_stack')
         stackFixerFunction = lambda line: stackFixerModule.fixSymbols(line)
 
       return stackFixerFunction
 
     def finish(self):
       if self.shutdownLeaks:
         self.shutdownLeaks.process()