--- a/dom/canvas/test/webgl-conf/checkout/conformance/textures/00_test_list.txt
+++ b/dom/canvas/test/webgl-conf/checkout/conformance/textures/00_test_list.txt
@@ -1,13 +1,13 @@
 misc/00_test_list.txt
-canvas/00_test_list.txt
-image/00_test_list.txt
-image_data/00_test_list.txt
---min-version 1.0.4 svg_image/00_test_list.txt
+//canvas/00_test_list.txt
+//image/00_test_list.txt
+//image_data/00_test_list.txt
+//--min-version 1.0.4 svg_image/00_test_list.txt
 video/00_test_list.txt
-webgl_canvas/00_test_list.txt
+//webgl_canvas/00_test_list.txt
 //image_bitmap_from_image_data/00_test_list.txt
 //image_bitmap_from_image/00_test_list.txt
 //image_bitmap_from_video/00_test_list.txt
 //image_bitmap_from_canvas/00_test_list.txt
 //image_bitmap_from_blob/00_test_list.txt
 //image_bitmap_from_image_bitmap/00_test_list.txt

--- a/dom/canvas/test/webgl-conf/checkout/conformance2/textures/00_test_list.txt
+++ b/dom/canvas/test/webgl-conf/checkout/conformance2/textures/00_test_list.txt
@@ -1,13 +1,13 @@
-misc/00_test_list.txt
-canvas/00_test_list.txt
-image/00_test_list.txt
-image_data/00_test_list.txt
-svg_image/00_test_list.txt
-video/00_test_list.txt
-webgl_canvas/00_test_list.txt
+//misc/00_test_list.txt
+//canvas/00_test_list.txt
+//image/00_test_list.txt
+//image_data/00_test_list.txt
+//svg_image/00_test_list.txt
+//video/00_test_list.txt
+//webgl_canvas/00_test_list.txt
 //image_bitmap_from_image_data/00_test_list.txt
 //image_bitmap_from_image/00_test_list.txt
 //image_bitmap_from_video/00_test_list.txt
 //image_bitmap_from_canvas/00_test_list.txt
 //image_bitmap_from_blob/00_test_list.txt
 //image_bitmap_from_image_bitmap/00_test_list.txt

--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -121,50 +121,46 @@ fail-if = (os == 'linux')
 # Crashes on B2G ICS Emulator, desktop Linux, and Mulet Linux x64.
 skip-if = (os == 'android') || (os == 'b2g') || (os == 'linux')
 
 [generated/test_conformance__misc__object-deletion-behaviour.html]
 fail-if = (os == 'android')
 # void mozilla::gl::GLContext::fDetachShader(GLuint, GLuint): Generated unexpected GL_INVALID_VALUE error. (0x0501)
 skip-if = (os == 'android' && debug)
 
-[generated/test_2_conformance2__textures__misc__tex-mipmap-levels.html]
-fail-if = (os == 'mac')
-skip-if = (os == 'win')
-
 [generated/test_conformance__extensions__oes-vertex-array-object.html]
 # 10.6 crash:
 # PROCESS-CRASH | dom/canvas/test/webgl-conf/generated/test_conformance__extensions__oes-vertex-array-object.html | application crashed [@ gleRunVertexSubmitImmediate + 0xf24]
 skip-if = (os == 'mac' && os_version == '10.6')
 fail-if = (os == 'win') || (os == 'mac') || (os == 'android') || (os == 'linux')
+[generated/test_conformance__textures__misc__texture-size.html]
+# application crashed [@ mozilla::gl::GLContext::AfterGLCall]
+skip-if = (os == 'android') || (os == 'win')
 
 [generated/test_2_conformance__textures__misc__cube-incomplete-fbo.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'mac')
+skip-if = (os == 'win')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__misc__instanceof-test.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-image-with-invalid-data.html]
 fail-if = (os == 'mac') || (os == 'win')
-[generated/test_2_conformance2__textures__misc__tex-unpack-params.html]
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__reading__read-pixels-into-pixel-pack-buffer.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__samplers__sampler-drawing-test.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-type-restrictions.html]
 fail-if = (os == 'mac') || (os == 'win')
-[generated/test_2_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
-fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__rendering__draw-buffers.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__samplers__samplers.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-image-with-format-and-type.html]
-fail-if = (os == 'mac') || (os == 'win')
+fail-if = (os == 'mac')
 [generated/test_2_conformance__attribs__gl-vertexattribpointer.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__reading__read-pixels-test.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-copying-restrictions.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__glsl3__forbidden-operators.html]
 fail-if = (os == 'mac') || (os == 'win')
@@ -183,50 +179,34 @@ fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__buffers__buffer-copying-contents.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__reading__read-pixels-pack-parameters.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__attribs__gl-vertexattribpointer.html]
 fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
 [generated/test_conformance__buffers__buffer-data-and-buffer-sub-data.html]
 fail-if = (os == 'mac') || (os == 'win') || (os == 'android') || (os == 'linux')
-[generated/test_2_conformance2__textures__misc__copy-texture-image.html]
-fail-if = (os == 'win')
-# Assertion: ""GFX: We should have caught all other errors"" in WebGLTextureUpload.cpp#
-skip-if = (os == 'mac')
 [generated/test_2_conformance__glsl__misc__shaders-with-invariance.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__textures__misc__tex-sub-image-2d-bad-args.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__misc__expando-loss-2.html]
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__ogles__GL__biuDepthRange__biuDepthRange_001_to_002.html]
 fail-if = (os == 'android') || (os == 'linux')
 [generated/test_conformance__ogles__GL__gl_FragCoord__gl_FragCoord_001_to_003.html]
 fail-if = (os == 'android') || (os == 'linux')
 
 [generated/test_conformance__textures__misc__texture-size-limit.html]
 fail-if = (os == 'linux') || (os == 'android')
 skip-if = (os == 'linux' && asan)
-[generated/test_2_conformance2__textures__canvas__tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
-skip-if = (os == 'mac' && debug)
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb9_e5-rgb-half_float.html]
-skip-if = (os == 'mac' && debug)
-fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance2__reading__read-pixels-from-fbo-test.html]
 skip-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__misc__uninitialized-test-2.html]
 skip-if = (os == 'mac') || (os == 'win')
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgba8ui-rgba_integer-unsigned_byte.html]
-# Assertion failure: shouldYFlip || srcStride != dstStride in WebGLTexelConversions.cpp
-skip-if = (os == 'mac') || (os == 'win')
-[generated/test_2_conformance2__textures__image_data__tex-3d-rgba8ui-rgba_integer-unsigned_byte.html]
-# Assertion failure: shouldYFlip || srcStride != dstStride in WebGLTexelConversions.cpp
-skip-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance2__state__gl-object-get-calls.html]
 # Hit MOZ_GL_DEBUG_ABORT_ON_ERROR on debug build
 skip-if = (os == 'mac') || (os == 'win')
 [generated/test_2_conformance__misc__bad-arguments-test.html]
 # skip because some result logged after SimpleTest.finish()
 skip-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__misc__bad-arguments-test.html]
 # skip because some result logged after SimpleTest.finish()
@@ -242,17 +222,17 @@ fail-if = (os == 'mac') || (os == 'linux
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__bugs__sampler-struct-function-arg.html]
 # Crashes
 skip-if = (os == 'linux') || (os == 'android')
 [generated/test_conformance__glsl__constructors__glsl-construct-bvec2.html]
 # mozalloc_abort in libglsl.so
 skip-if = (os == 'linux') || (os == 'android')
 [generated/test_conformance__glsl__bugs__pow-of-small-constant-in-user-defined-function.html]
-fail-if = (os == 'win')
+fail-if = (os == 'win' && os_version != '5.1')
 skip-if = (os == 'android')
 ########################################################################
 # "tst-linux{32,64}-spot-NNN" Slaves:
 #   Android 2.3, B2G Emu, Linux, and Mulet.
 # Android: os == 'android'. (Not enough info to separate out 2.3)
 # B2G Emu: os == 'b2g'.
 # Linux: os == 'linux'.
 # Mulet: os == 'b2g' && buildapp == 'mulet'.
@@ -270,19 +250,17 @@ fail-if = (os == 'android') || (os == 'l
 [generated/test_conformance__reading__read-pixels-test.html]
 # Causes consistent *blues*: "DMError: Remote Device Error: unable to
 # connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
 # Crashes near on B2G ICS Emulator.
 skip-if = (os == 'android') || (os == 'linux')
 fail-if = (os == 'mac') || (os == 'win')
 [generated/test_conformance__textures__misc__texture-upload-size.html]
 # application crashed [@ mozilla::WebGLTexture::TexSubImage]
-skip-if = (os == 'win' && debug) || (os == 'android')
-# Only got failures on window 7
-fail-if = (os == 'win' && os_version == '6.1')
+skip-if = (os == 'win') || (os == 'android')
 
 ########################################################################
 ########################################################################
 # Android
 
 [generated/test_conformance__attribs__gl-disabled-vertex-attrib.html]
 fail-if = (os == 'android')
 [generated/test_conformance__extensions__oes-texture-float.html]
@@ -315,19 +293,16 @@ fail-if = (os == 'android')
 fail-if = (os == 'android')
 
 [generated/test_conformance__textures__video__tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html]
 # timed out crash
 skip-if = (os == 'android')
 [generated/test_conformance__textures__video__tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html]
 # timed out
 skip-if = (os == 'android')
-[generated/test_conformance__textures__misc__texture-size.html]
-# application crashed [@ mozilla::gl::GLContext::AfterGLCall]
-skip-if = (os == 'android')
 [generated/test_conformance__canvas__buffer-offscreen-test.html]
 # Causes frequent *blues*: "DMError: Remote Device Error: unable to
 # connect to 127.0.0.1 after 5 attempts" on 'Android 2.3 Opt'.
 skip-if = (os == 'android' && android_version == '10')
 
 [generated/test_conformance__canvas__rapid-resizing.html]
 # Frequent orange crash.
 skip-if = (os == 'android')
@@ -403,16 +378,22 @@ skip-if = (os == 'android')
 skip-if = (os == 'android')
 [generated/test_conformance__glsl__bugs__compare-loop-index-to-uniform.html]
 skip-if = (os == 'android')
 [generated/test_conformance__misc__boolean-argument-conversion.html]
 skip-if = (os == 'android')
 [generated/test_conformance__textures__misc__texture-npot.html]
 # application crashed [@ mozilla::gl::GLContext::AfterGLCall]
 skip-if = (os == 'android')
+[generated/test_conformance__textures__misc__texture-npot-video.html]
+# application crashed [@ mozilla::layers::GLImage::GetAsSoure]
+skip-if = (os == 'android')
+[generated/test_conformance__glsl__functions__glsl-function-step-gentype.html]
+# application crashed [@ jemalloc_crash]
+skip-if = (os == 'android')
 [generated/test_conformance__misc__shader-precision-format.html]
 # application crashed [@ jemalloc_crash]
 skip-if = (os == 'android')
 [generated/test_conformance__textures__misc__tex-image-webgl.html]
 skip-if = (os == 'android')
 [generated/test_conformance__textures__misc__gl-teximage.html]
 # application crashed [@ jemalloc_crash]
 skip-if = (os == 'android')
@@ -551,26 +532,17 @@ skip-if = (os == 'linux')
 [generated/test_conformance__canvas__drawingbuffer-static-canvas-test.html]
 # Intermittent crash on OSX.
 skip-if = (os == 'mac')
 [generated/test_conformance__canvas__viewport-unchanged-upon-resize.html]
 # New OSX r7 machines and 10.10.5 is causing perma failure (bug 1216549)
 skip-if = (os == 'mac')
 [generated/test_conformance__rendering__multisample-corruption.html]
 # application crashed [@ gldAttachDrawable + 0x9e0]. Also crash on Android.
-skip-if = (os == 'mac') || (os == 'android')
-[generated/test_2_conformance2__textures__misc__compressed-tex-image.html]
-# Assertion: ""GFX: We should have caught all other errors"" in WebGLTextureUpload.cpp
-skip-if = (os == 'mac')
-[generated/test_2_conformance2__textures__misc__tex-storage-compressed-formats.html]
-# Assertion: ""GFX: We should have caught all other errors"" in WebGLTextureUpload.cpp
-skip-if = (os == 'mac')
-[generated/test_2_conformance2__textures__misc__texture-npot.html]
-# Assertion: ""GFX: We should have caught all other errors"" in WebGLTextureUpload.cpp
-skip-if = (os == 'mac')
+skip-if = (os == 'mac') || (os == 'android') || (os == 'win')
 [generated/test_2_conformance__textures__misc__copy-tex-image-2d-formats.html]
 # Assertion: ""GFX: We should have caught all other errors"" in WebGLTextureUpload.cpp
 skip-if = (os == 'mac')
 
 ####################
 # 10.6
 [generated/test_conformance__glsl__constructors__glsl-construct-mat3.html]
 fail-if = (os == 'mac' && os_version == '10.6')
@@ -593,81 +565,34 @@ fail-if = (os == 'mac' && os_version == 
 fail-if = (os == 'mac' && os_version == '10.8')
 [generated/test_conformance__glsl__variables__gl-pointcoord.html]
 fail-if = (os == 'mac' && os_version == '10.8')
 [generated/test_conformance__limits__gl-max-texture-dimensions.html]
 fail-if = (os == 'mac' && os_version == '10.8')
 
 ####################
 # failure on OSX
-[generated/test_2_conformance2__textures__video__tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance__textures__video__tex-2d-rgb-rgb-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__video__tex-2d-rgba4-rgba-unsigned_byte.html]
-fail-if = (os == 'mac')
 [generated/test_2_conformance__rendering__point-with-gl-pointcoord-in-fragment-shader.html]
 fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__video__tex-2d-srgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__video__tex-2d-rgba8-rgba-unsigned_byte.html]
-fail-if = (os == 'mac')
 [generated/test_2_conformance__glsl__variables__gl-pointcoord.html]
 fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__video__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__video__tex-2d-rgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'mac')
 [generated/test_2_conformance2__state__gl-get-calls.html]
 fail-if = (os == 'mac')
 [generated/test_conformance__extensions__angle-instanced-arrays.html]
 fail-if = (os == 'mac')
 [generated/test_2_conformance__rendering__point-size.html]
 fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__video__tex-2d-rgb565-rgb-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance__textures__video__tex-2d-rgba-rgba-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__canvas__tex-2d-rg8ui-rg_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb8ui-rgb_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgba8ui-rgba_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__image_data__tex-2d-r8ui-red_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__image_data__tex-2d-rg8ui-rg_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgb8ui-rgb_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-r8ui-red_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rg8ui-rg_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb8ui-rgb_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgba8ui-rgba_integer-unsigned_byte.html]
-fail-if = (os == 'mac')
 
-
-[generated/test_2_conformance2__textures__canvas__tex-2d-r8ui-red_integer-unsigned_byte.html]
-# Assertion failure on debug
-skip-if = (os == 'mac')
 [generated/test_2_conformance2__extensions__ext-color-buffer-float.html]
 fail-if = (os == 'mac')
 skip-if = (os == 'mac' && debug)
 [generated/test_2_conformance__limits__gl-line-width.html]
 skip-if = (os == 'mac')
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgba16f-rgba-float.html]
-skip-if = (os == 'mac' && debug)
 [generated/test_2_conformance__misc__type-conversion-test.html]
 skip-if = (os == 'mac' && debug)
-[generated/test_2_conformance2__textures__misc__gl-get-tex-parameter.html]
-# Hit MOZ_GL_DEBUG_ABORT_ON_ERROR on debug build
-skip-if = (os == 'mac')
 [generated/test_2_conformance__state__gl-get-calls.html]
 # Hit MOZ_GL_DEBUG_ABORT_ON_ERROR on debug build
 fail-if = (os == 'mac')
 skip-if = (os == 'mac' && debug)
 
 
 
 ########################################################################
@@ -678,16 +603,18 @@ skip-if = (os == 'mac' && debug)
 skip-if = (os == 'win')
 [generated/test_conformance__ogles__GL__built_in_varying_array_out_of_bounds__built_in_varying_array_out_of_bounds_001_to_001.html]
 # time out crash
 skip-if = (os == 'win')
 [generated/test_2_conformance2__glsl3__vector-dynamic-indexing.html]
 skip-if = (os == 'win')
 [generated/test_conformance__glsl__misc__large-loop-compile.html]
 fail-if = (os == 'win' && os_version == '5.1')
+[generated/test_conformance__textures__misc__copy-tex-image-2d-formats.html]
+skip-if = (os == 'win' && os_version == '5.1')
 [generated/test_conformance__uniforms__uniform-values-per-program.html]
 # Crashes on D3D11 debug.
 skip-if = (os == 'win' && os_version != '5.1')
 [generated/test_2_conformance2__glsl3__uniform-location-length-limits.html]
 # time out crash
 skip-if = (os == 'win' && debug)
 [generated/test_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
 # time out crash
@@ -702,189 +629,79 @@ skip-if = (os == 'win')
 # timed out crash
 skip-if = (os == 'win')
 [generated/test_2_conformance__canvas__canvas-test.html]
 # this test is not always passed every time on opt and debug build
 skip-if = (os == 'win')
 [generated/test_2_conformance__canvas__to-data-url-test.html]
 # TEST-UNEXPECTED-ERROR: Assertion count 1 is greater than expected range 0-0 assertions
 skip-if = (os == 'win')
+[generated/test_2_conformance__textures__misc__texture-size-cube-maps.html]
+# Random failures
+skip-if = (os == 'win')
+[generated/test_2_conformance__ogles__GL__struct__struct_025_to_032.html]
+# application crashed [@ nvoglv32.dll + 0x90b445]
+skip-if = (os == 'win')
+[generated/test_2_conformance__uniforms__out-of-bounds-uniform-array-access.html]
+# application terminated
+skip-if = (os == 'win')
+[generated/test_2_conformance__textures__misc__texture-size.html]
+skip-if = (os == 'win')
+[generated/test_2_conformance2__query__occlusion-query.html]
+skip-if = (os == 'win')
+[generated/test_2_conformance2__query__query.html]
+# random timed out
+skip-if = (os == 'win')
+[generated/test_2_conformance2__attribs__gl-vertex-attrib.html]
+# random timed out
+skip-if = (os == 'win')
+[generated/test_2_conformance2__glsl3__short-circuiting-in-loop-condition.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__context__context-attribute-preserve-drawing-buffer.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-bvec2.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-bvec3.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-bvec4.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-ivec2.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-ivec3.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-ivec4.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-vec2.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-vec3.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__glsl__constructors__glsl-construct-vec4.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
+[generated/test_2_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
+# Failure on win7 but got passed on win7 vm
+skip-if = (os == 'win' && os_version == '6.1')
 
 ####################
 # failure on Windows
 [generated/test_conformance__rendering__point-specific-shader-variables.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-ivec2.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image__tex-2d-rgba8-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-bvec4.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgb565-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb16f-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__glsl3__short-circuiting-in-loop-condition.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image__tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb16f-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
+fail-if = (os == 'win' && os_version != '5.1')
 [generated/test_2_conformance__canvas__rapid-resizing.html]
 fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__svg_image__tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
-fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-aliasing.html]
 fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image_data__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-rg8-rg-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-rg8-rg-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgba4-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-rgb9_e5-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-r11f_g11f_b10f-rgb-unsigned_int_10f_11f_11f_rev.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__context__context-attribute-preserve-drawing-buffer.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-vec3.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-ivec3.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgb9_e5-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-srgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-r32f-red-float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rg8-rg-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
 [generated/test_2_conformance__attribs__gl-bindAttribLocation-matrix.html]
 fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-srgb8_alpha8-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__textures__misc__texture-size-cube-maps.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image__tex-2d-r16f-red-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb565-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__query__occlusion-query.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image__tex-2d-rgb16f-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-rgb16f-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgb565-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgba4-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rgba8-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-r32f-red-float.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb5_a1-rgba-unsigned_short_5_5_5_1.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-vec4.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgba8-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-srgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-bvec3.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance__glsl__constructors__glsl-construct-vec2.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance__glsl__constructors__glsl-construct-ivec4.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb9_e5-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rg16f-rg-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__svg_image__tex-2d-r16f-red-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-srgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image_data__tex-2d-r16f-red-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image__tex-2d-rg16f-rg-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-r32f-red-float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-srgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__svg_image__tex-2d-rg8-rg-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__svg_image__tex-2d-rgb565-rgb-unsigned_short_5_6_5.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-r16f-red-float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-r11f_g11f_b10f-rgb-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-r16f-red-half_float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-rgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-vec-mat-corner-cases.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__webgl_canvas__tex-2d-r16f-red-float.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance__glsl__constructors__glsl-construct-bvec2.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image__tex-2d-rgb565-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-r16f-red-float.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__svg_image__tex-2d-rgba4-rgba-unsigned_short_4_4_4_4.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rg8-rg-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-r16f-red-half_float.html]
-fail-if = (os == 'win')
-[generated/test_2_conformance2__textures__image__tex-2d-rgba4-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-rgb5_a1-rgba-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__image__tex-2d-rgb8-rgb-unsigned_byte.html]
-fail-if = (os == 'win' && !debug)
-[generated/test_2_conformance2__textures__canvas__tex-2d-rg16f-rg-half_float.html]
-fail-if = (os == 'win')
+[generated/test_conformance__glsl__bugs__floor-div-cos-should-not-truncate.html]
+fail-if = (os == 'win' && os_version == '5.1')
\ No newline at end of file