Bug 1370840 - Make regexp more general for capturing lines. r=dbaron draft
authorXidorn Quan <me@upsuper.org>
Wed, 07 Jun 2017 20:14:18 +1000
changeset 590607 e979f9c6cfa256cfbda7970be82728226f2fa5ad
parent 590235 72c6a2b335b3945d30beed7c0fd545c590d802e7
child 632277 e3ce8d8227fe96428818ca168fa16d0b94f343eb
push id62797
push userxquan@mozilla.com
push dateWed, 07 Jun 2017 23:13:41 +0000
reviewersdbaron
bugs1370840
milestone55.0a1
Bug 1370840 - Make regexp more general for capturing lines. r=dbaron This change additionally support lines like: (from Android) > ... 11:39:13 INFO - REFTEST TEST-UNEXPECTED-FAIL | http://... (from Windows) > 11:25:29 ERROR - REFTEST TEST-UNEXPECTED-FAIL | file:///... MozReview-Commit-ID: IVBvdxjp0MD
layout/tools/reftest/reftest-analyzer.xhtml
--- a/layout/tools/reftest/reftest-analyzer.xhtml
+++ b/layout/tools/reftest/reftest-analyzer.xhtml
@@ -218,17 +218,17 @@ var gTestItems;
 function process_log(contents) {
   var lines = contents.split(/[\r\n]+/);
   gTestItems = [];
   for (var j in lines) {
     var line = lines[j];
     // Ignore duplicated output in logcat.
     if (line.match(/I\/Gecko.*?REFTEST/))
       continue;
-    var match = line.match(/^(?:.*? INFO - )?(?:REFTEST )?(.*)$/);
+    var match = line.match(/^(?:.*? (?:INFO|ERROR) -\s+)?(?:REFTEST\s+)?(.*)$/);
     if (!match)
       continue;
     line = match[1];
     match = line.match(/^(TEST-PASS|TEST-UNEXPECTED-PASS|TEST-KNOWN-FAIL|TEST-UNEXPECTED-FAIL|TEST-DEBUG-INFO)(\(EXPECTED RANDOM\)|) \| ([^\|]+) \|(.*)/);
     if (match) {
       var state = match[1];
       var random = match[2];
       var url = match[3];