Bustage fix for bug 716859. r=bjacob,joe CLOSED TREE
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Thu, 21 Feb 2013 17:44:10 -0500
changeset 122588 6c64bae71de5
parent 122587 6c126d076b0d
child 122589 7527155b156f
push id24349
push userryanvm@gmail.com
push dateFri, 22 Feb 2013 17:43:12 +0000
treeherdermozilla-central@e36f42046452 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob, joe
bugs716859
milestone22.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
Bustage fix for bug 716859. r=bjacob,joe CLOSED TREE Don't try to pass the conformance tests if we've disabled webgl.
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
@@ -411,16 +411,18 @@ function start() {
                     .getContext("experimental-webgl");
     } catch(e) {}
     if (!ctx) {
         var errmsg = "Can't create a WebGL context";
         reporter.fullResultsNode.textContent = errmsg;
         // Workaround for SeaMonkey tinderboxes which don't support WebGL.
         if (navigator.userAgent.match(/ SeaMonkey\//))
           todo(false, errmsg + " (This is expected on SeaMonkey (tinderboxes).)");
+        else if (SpecialPowers.getBoolPref("webgl.disabled"))
+          todo(false, errmsg + " (This is expected on when WebGL is disabled)");
         else
           ok(false, errmsg);
         reporter.finishedTestSuite();
         return;
     }
 
     statusTextNode.textContent = 'Loading test lists...';
     var iframe = document.getElementById("testframe");