Bug 1370840 - Make regexp more general for capturing lines. r=dbaron
authorXidorn Quan <me@upsuper.org>
Wed, 07 Jun 2017 20:14:18 +1000
changeset 411001 496a533b6037dbd0a87ae6bf51fa1d919c0dd455
parent 411000 1ba8f05e12f31500cee3795649b63bf7abfe3b37
child 411002 38740950a317793c48629a961d65765d87b477fb
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1370840
milestone55.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 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];