Bug 1201885,1247752,1247753 - Re-mark passing/failing tests.

dom/canvas/moz.build

@@ -7,7 +7,7 @@
 TEST_DIRS += ['compiledtest']
 
 # Number changes to this file to avoid bug 1081323 (clobber after changing a manifest):
-# 5
+# 9
 
 MOCHITEST_MANIFESTS += [
     'test/crossorigin/mochitest.ini',

dom/canvas/test/webgl-conformance/mochi-single.html

@@ -117,7 +117,6 @@ function GetExpectedTestFailSet() {
         failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
         failSet['conformance/misc/object-deletion-behaviour.html'] = true;
         failSet['conformance/textures/tex-image-with-format-and-type.html'] = true;
-        failSet['conformance/textures/texture-mips.html'] = true;
         failSet['conformance/textures/texture-npot.html'] = true;
         failSet['conformance/textures/texture-size-cube-maps.html'] = true;
       } else if (DriverInfo.getOSVersion() >= OS_VERSION_ANDROID_ICS) {
@@ -135,7 +134,6 @@ function GetExpectedTestFailSet() {
         failSet['conformance/state/gl-get-calls.html'] = true;
         failSet['conformance/textures/tex-image-with-format-and-type.html'] = true;
         failSet['conformance/textures/tex-sub-image-2d.html'] = true;
-        failSet['conformance/textures/texture-mips.html'] = true;
         failSet['conformance/textures/texture-size-cube-maps.html'] = true;
       } else {
         // Android 2.3 slaves.
@@ -144,7 +142,6 @@ function GetExpectedTestFailSet() {
         failSet['conformance/misc/object-deletion-behaviour.html'] = true;
         failSet['conformance/programs/program-test.html'] = true;
         failSet['conformance/textures/tex-image-and-sub-image-2d-with-video.html'] = true;
-        failSet['conformance/textures/texture-mips.html'] = true;
         failSet['conformance/textures/texture-npot.html'] = true;
       }
       break;
@@ -158,7 +155,6 @@ function GetExpectedTestFailSet() {
       failSet['conformance/misc/object-deletion-behaviour.html'] = true;
       failSet['conformance/programs/get-active-test.html'] = true;
       failSet['conformance/textures/tex-input-validation.html'] = true;
-      failSet['conformance/textures/texture-mips.html'] = true;
       failSet['conformance/textures/texture-npot.html'] = true;
       failSet['conformance/textures/texture-size-cube-maps.html'] = true;
       failSet['conformance/textures/texture-size.html'] = true;

dom/canvas/test/webgl-mochitest.ini

@@ -15,11 +15,11 @@ fail-if = (os == 'android')
 [webgl-mochitest/ensure-exts/test_EXT_color_buffer_half_float.html]
 fail-if = (os == 'android')
 [webgl-mochitest/ensure-exts/test_EXT_disjoint_timer_query.html]
-fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')
+fail-if = (os == 'android') || (os == 'mac') || (os == 'win')
 [webgl-mochitest/ensure-exts/test_EXT_frag_depth.html]
 fail-if = (os == 'android')
 [webgl-mochitest/ensure-exts/test_EXT_sRGB.html]
-fail-if = (os == 'android') || (os == 'linux') || (os == 'mac' && os_version == '10.6') || (os == 'win')
+fail-if = (os == 'android') || (os == 'mac' && os_version == '10.6') || (os == 'win')
 [webgl-mochitest/ensure-exts/test_EXT_shader_texture_lod.html]
 fail-if = (os == 'android') || (os == 'linux') || (os == 'mac')
 [webgl-mochitest/ensure-exts/test_EXT_texture_filter_anisotropic.html]