Bug 1448698 - Use alternate path for stackfixer import in android mochitests; r=me,a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Thu, 04 Oct 2018 13:07:04 -0600
changeset 495441 0044b2201cb71f3c2d3c5aa6dda040f693847b79
parent 495440 922b85723d9f859be0e37f8454e1e76e8e8e9af9
child 495442 dc2f7806fbc110be3a08a6a835dad6c5d095355f
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, test-only
bugs1448698
milestone64.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 1448698 - Use alternate path for stackfixer import in android mochitests; r=me,a=test-only Android mochitests typically use the xre-path instead of the utility-path. The stack fixer module should be available in the host-utils, pointed to by xre-path.
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2830,22 +2830,23 @@ toolbar#nav-bar {
 
         # Stop leak detection if m-bc code coverage is enabled
         # by maxing out the leak threshold for all processes.
         if options.jscov_dir_prefix:
             for processType in leakThresholds:
                 ignoreMissingLeaks.append(processType)
                 leakThresholds[processType] = sys.maxsize
 
+        utilityPath = options.utilityPath or options.xrePath
         mozleak.process_leak_log(
             self.leak_report_file,
             leak_thresholds=leakThresholds,
             ignore_missing_leaks=ignoreMissingLeaks,
             log=self.log,
-            stack_fixer=get_stack_fixer_function(options.utilityPath,
+            stack_fixer=get_stack_fixer_function(utilityPath,
                                                  options.symbolsPath),
         )
 
         self.log.info("runtests.py | Running tests: end.")
 
         if self.manifest is not None:
             self.cleanup(options, False)