Bug 1087560 - Fix test order and missing debug() func. - r=kamidphish
☠☠ backed out by 0765b774eb6c ☠ ☠
authorJeff Gilbert <jgilbert@mozilla.com>
Wed, 22 Oct 2014 14:58:58 -0700
changeset 212061 8c366a73988cb459c7cabbad5370655bb542293f
parent 212060 508d70d4689839b07ce29fa83defa24dc10f7aee
child 212062 265a63f3f5e12454a6df8729a9fcaec884b70f31
push id27697
push usercbook@mozilla.com
push dateFri, 24 Oct 2014 13:48:53 +0000
treeherdermozilla-central@de805196bbc4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskamidphish
bugs1087560
milestone36.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 1087560 - Fix test order and missing debug() func. - r=kamidphish
dom/canvas/test/webgl-mochitest.ini
dom/canvas/test/webgl-mochitest/test_backbuffer_channels.html
dom/canvas/test/webgl-mochitest/test_hidden_alpha.html
--- a/dom/canvas/test/webgl-mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest.ini
@@ -1,19 +1,19 @@
 [DEFAULT]
 support-files =
   webgl-mochitest/driver-info.js
   webgl-mochitest/webgl-util.js
 
 [webgl-mochitest/test_backbuffer_channels.html]
-[webgl-mochitest/test_hidden_alpha.html]
 [webgl-mochitest/test_depth_readpixels.html]
 [webgl-mochitest/test_draw.html]
 [webgl-mochitest/test_fb_param.html]
 [webgl-mochitest/test_fb_param_crash.html]
+[webgl-mochitest/test_hidden_alpha.html]
 [webgl-mochitest/test_highp_fs.html]
 [webgl-mochitest/test_no_arr_points.html]
 [webgl-mochitest/test_noprog_draw.html]
 [webgl-mochitest/test_privileged_exts.html]
 [webgl-mochitest/test_texsubimage_float.html]
 [webgl-mochitest/test_webgl_available.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [webgl-mochitest/test_webgl_conformance.html]
--- a/dom/canvas/test/webgl-mochitest/test_backbuffer_channels.html
+++ b/dom/canvas/test/webgl-mochitest/test_backbuffer_channels.html
@@ -3,17 +3,17 @@
 <script src="/tests/SimpleTest/SimpleTest.js"></script>
 <link rel="stylesheet" href="/tests/SimpleTest/test.css">
 <script src="driver-info.js"></script>
 <script src="webgl-util.js"></script>
 <body>
 <script>
 
 function TestAttribs(attribs) {
-  debug('Testing attribs: ' + JSON.stringify(attribs));
+  ok(true, 'Testing attribs: ' + JSON.stringify(attribs));
   var canvas = document.createElement('canvas');
   var gl = canvas.getContext('experimental-webgl', attribs);
   ok(gl, 'No tested attribs should result in failure to create a context');
   if (!gl)
     return;
 
   var actual = gl.getContextAttributes();
 
--- a/dom/canvas/test/webgl-mochitest/test_hidden_alpha.html
+++ b/dom/canvas/test/webgl-mochitest/test_hidden_alpha.html
@@ -72,17 +72,17 @@ function Test(gl, prog) {
   gl.enable(gl.BLEND);
   gl.blendFunc(gl.ZERO, gl.DST_ALPHA);
 
   var iColor = 64;
   var fColor = iColor / 255.0;
 
   //////////////////
 
-  debug('clear(R,G,B,0)');
+  ok(true, 'clear(R,G,B,0)');
 
   Reset(gl);
 
   gl.clearColor(fColor, fColor, fColor, 0.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
 
   var dataURL_pre = gl.canvas.toDataURL();
   //console.log('Before blending: ' + dataURL_pre);
@@ -97,17 +97,17 @@ function Test(gl, prog) {
 
   var dataURL_post = gl.canvas.toDataURL();
   //console.log('After blending: ' + dataURL_post);
   ok(dataURL_post == dataURL_pre,
      'toDataURL should be unchanged after blending.');
 
   //////////////////
 
-  debug('mask(R,G,B,0), clear(R,G,B,1)');
+  ok(true, 'mask(R,G,B,0), clear(R,G,B,1)');
 
   Reset(gl);
 
   gl.colorMask(true, true, true, false);
   gl.clearColor(fColor, fColor, fColor, 1.0);
   gl.clear(gl.COLOR_BUFFER_BIT);
   gl.colorMask(true, true, true, true);