Bug 1353858 - Fix ASAN leak detection in mochitest, r=ato draft
authorJames Graham <james@hoppipolla.co.uk>
Thu, 06 Apr 2017 17:15:01 +0100
changeset 557348 23517fa8360286a2fd10a2f7bb256887145b2abf
parent 557282 facaf90aeaaf6d7cf5e2966f9f918319536bddea
child 623031 77c56b596f1ad538d9016f29b76b934064c50f99
push id52695
push userbmo:james@hoppipolla.co.uk
push dateThu, 06 Apr 2017 17:51:33 +0000
reviewersato
bugs1353858
milestone55.0a1
Bug 1353858 - Fix ASAN leak detection in mochitest, r=ato The gecko messages are now in the "process_output" action, rather than in the "log" action (except for a few legacy cases), so examine both when looking for LSAN messages. MozReview-Commit-ID: 82r1p8WLwFa
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -2716,18 +2716,19 @@ toolbar#nav-bar {
 
         def dumpScreenOnFail(self, message):
             if self.dump_screen_on_fail and 'expected' in message and message[
                     'status'] == 'FAIL':
                 self.harness.dumpScreen(self.utilityPath)
             return message
 
         def trackLSANLeaks(self, message):
-            if self.lsanLeaks and message['action'] == 'log':
-                self.lsanLeaks.log(message['message'])
+            if self.lsanLeaks and message['action'] in ('log', 'process_output'):
+                line = message['message'] if message['action'] == 'log' else message['data']
+                self.lsanLeaks.log(line)
             return message
 
         def trackShutdownLeaks(self, message):
             if self.shutdownLeaks:
                 self.shutdownLeaks.log(message)
             return message
 
     def getDirectories(self, options):