Bug 1362811 - Don't require REFTEST prefix in unstructured reftest analyzer, r=dbaron draft
authorJames Graham <james@hoppipolla.co.uk>
Sun, 07 May 2017 00:20:43 +0100
changeset 573720 767bbe2f7663246b79071f9439a747e04d38fa14
parent 572730 0b255199db9d6a6f189b89b7906f99155bde3726
child 627384 025236eccb4eeb702407871cb9187044e15858ff
push id57483
push userbmo:james@hoppipolla.co.uk
push dateSat, 06 May 2017 23:23:46 +0000
reviewersdbaron
bugs1362811
milestone55.0a1
Bug 1362811 - Don't require REFTEST prefix in unstructured reftest analyzer, r=dbaron This prefix can't be produced by the standard structured logging formatters because it doesn't know that the tests are reftests. Therefore the reftest harness has a hack to add this prefix, and the unstructured analyzer doesn't work with wpt reftests. This can simply be solved by making the prefix optional, but looking for the "INFO - " prefix that mozharness adds, when present, to identify the start of the TEST- string. MozReview-Commit-ID: GxWVWOSkAUZ
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(/^.*?REFTEST (.*)$/);
+    var match = line.match(/^(?:.*? INFO - )?(?:REFTEST )?(.*)$/);
     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];