From 446aaeb959aab10b42708db66d9c95fff92d59ee Mon Sep 17 00:00:00 2001 From: Doug Sherk Date: Fri, 18 Nov 2011 22:57:29 -0500 Subject: [PATCH] Bug 699626: patch reftest analyzer and WebGL reftests r=dbaron --- content/canvas/test/webgl/resources/js-test-pre.js | 3 +-- layout/tools/reftest/reftest-analyzer.xhtml | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/content/canvas/test/webgl/resources/js-test-pre.js b/content/canvas/test/webgl/resources/js-test-pre.js index 21b3b9b00ca1..77271ebe313d 100644 --- a/content/canvas/test/webgl/resources/js-test-pre.js +++ b/content/canvas/test/webgl/resources/js-test-pre.js @@ -134,10 +134,9 @@ function testFailedRender(msg, ref, test, width, height) testFailed(msg); - var data = 'REFTEST TEST-KNOWN-FAIL | ' + msg + ' | image comparison (==)\n' + + var data = 'REFTEST TEST-DEBUG-INFO | ' + msg + ' | image comparison (==)\n' + 'REFTEST IMAGE 1 (TEST): ' + testData + '\n' + 'REFTEST IMAGE 2 (REFERENCE): ' + refData; - dump('The following information is for debugging purposes only. It will always print TEST-KNOWN-FAIL, even if it is unexpected.'); dump('FAIL: ' + data + '\n'); dump('To view the differences between these image renderings, go to the following link: https://hg.mozilla.org/mozilla-central/raw-file/tip/layout/tools/reftest/reftest-analyzer.xhtml#log=' + encodeURIComponent(encodeURIComponent(data)) + '\n'); diff --git a/layout/tools/reftest/reftest-analyzer.xhtml b/layout/tools/reftest/reftest-analyzer.xhtml index c7b3dea57e7e..b6793ef23b26 100644 --- a/layout/tools/reftest/reftest-analyzer.xhtml +++ b/layout/tools/reftest/reftest-analyzer.xhtml @@ -236,7 +236,7 @@ function process_log(contents) { if (!match) continue; line = match[1]; - match = line.match(/^(TEST-PASS|TEST-UNEXPECTED-PASS|TEST-KNOWN-FAIL|TEST-UNEXPECTED-FAIL)(\(EXPECTED RANDOM\)|) \| ([^\|]+) \|(.*)/); + 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]; @@ -244,7 +244,7 @@ function process_log(contents) { var extra = match[4]; gTestItems.push( { - pass: !state.match(/FAIL$/), + pass: !state.match(/DEBUG-INFO$|FAIL$/), // only one of the following three should ever be true unexpected: !!state.match(/^TEST-UNEXPECTED/), random: (random == "(EXPECTED RANDOM)"),