Bug 640887 - Ignore canvas-test on Windows XP, since it fails most of the time; r=bjacob
authorJoe Drew <joe@drew.ca>
Mon, 11 Apr 2011 09:12:17 -0400
changeset 67841 7a0acca5854b
parent 67840 364b5727594a
child 67842 fd6a216b1072
push id19437
push usereakhgari@mozilla.com
push date2011-04-11 17:12 +0000
treeherdermozilla-central@f65b79eeabd4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs640887
milestone2.2a1pre
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 640887 - Ignore canvas-test on Windows XP, since it fails most of the time; r=bjacob
content/canvas/test/webgl/test_webgl_conformance_test_suite.html
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@@ -71,17 +71,17 @@ function start() {
     li.appendChild(ul);
     div.appendChild(node);
     this.totalsElem = node;
     this.resultElem = ul;
     this.elem = li;
   };
 
   Page.prototype.isExpectedToFullyPass = function() {
-    return testsExpectedToFail.indexOf(this.url) == -1;
+    return testsExpectedToFail.indexOf(this.url) == -1 && testsToIgnore.indexOf(this.url) == -1;
   }
 
   Page.prototype.errormsg = function(msg) {
     return msg + ' (URL: ' + this.url + ')';
   }
 
   Page.prototype.addResult = function(msg, success) {
     ++this.totalTests;
@@ -193,16 +193,18 @@ function start() {
   Reporter.prototype.startPage = function(url) {
     dump('WebGL mochitest: starting page ' + url + '\n');
     var page = this.pagesByURL[url];
     this.currentPage = page;
     statusTextNode.textContent = 'Running URL: ' + url;
     expectedtofailTextNode.textContent = testsExpectedToFail.length +
                                          ' test pages are expected to fail out of ' +
                                          this.totalPages;
+    ignoredtestsTextNode.textContent = testsToIgnore.length +
+                                         ' test pages have their results ignored';
     return page.startPage();
   };
 
   Reporter.prototype.totalFailed = function() {
     return this.totalTests - this.totalSuccessful;
   };
 
   Reporter.prototype.displayStats = function() {
@@ -336,35 +338,41 @@ function start() {
   var statusElem = document.getElementById("status");
   var statusTextNode = document.createTextNode('');
   statusElem.appendChild(statusTextNode);
 
   var expectedtofailElem = document.getElementById("expectedtofail");
   var expectedtofailTextNode = document.createTextNode('');
   expectedtofailElem.appendChild(expectedtofailTextNode);
 
+  var ignoredtestsElem = document.getElementById("ignoredtests");
+  var ignoredtestsTextNode = document.createTextNode('');
+  ignoredtestsElem.appendChild(ignoredtestsTextNode);
+
   // Windows uses the ANGLE library for rendering. Until everything is perfect, this means a different set of
   // failing tests. It's easier to do a platform check for Windows than for ANGLE itself.
   // Moreover, we currently also have different tests failing on Mac and on Linux,
   // presumably due to differences in the drivers.
   var failingTestsFilename;
   if (kIsWindows)
     failingTestsFilename = 'failing_tests_windows.txt';
   else if (kIsLinux)
     failingTestsFilename = 'failing_tests_linux.txt';
   else if (kIsMac)
     failingTestsFilename = 'failing_tests_mac.txt';
 
   var testsExpectedToFail = loadTextFileSynchronous(failingTestsFilename)
                             .replace(/\r/g, '') // convert to unix line breaks
                             .split('\n');
 
+  var testsToIgnore = [];
+
   // canvas-test.html is currently failing on Windows XP test slaves
   if (kIsWindows && !kIsWindowsVistaOrHigher)
-      testsExpectedToFail.push('conformance/canvas-test.html');
+      testsToIgnore.push('conformance/canvas-test.html');
 
   var testsSuccessful = [];
 
   runTestSuite();
 }
 
 </script>
 </head>
@@ -380,16 +388,18 @@ function start() {
 <tr><td><h4>WebGL Conformance Test Runner</h4>
 <tr><td>
   <div style="border: 1px">
     <b>Status:</b> <div><span id="status"></span></div><br />
     <b>Results:</b>
     <div><span id="results-default"></span></div>
     <br />
     <div><span id="expectedtofail"></span></div>
+    <br />
+    <div><span id="ignoredtests"></span></div>
   </div>
 </td></tr>
 </table>
 </td>
 <td>
 <iframe id="testframe" scrolling="yes" width="100%" height="100%"></iframe>
 </td>
 </tr>