Backed out changeset 3b24fcb598fd (bug 1285692)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 19 Jul 2016 14:15:59 +0200
changeset 330759 5c12f81ec7f999d8c6140f2dd6bd91d03513cff1
parent 330758 777e1b279e39612fd7d86c5d9e886b4ed5a625a0
child 330760 c1b834b45a99229bf35b21d58e2c8056e3fb0b13
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1285692
milestone50.0a1
backs out3b24fcb598fd5a830500bc8bf96545adf31eae1f
Backed out changeset 3b24fcb598fd (bug 1285692)
dom/canvas/test/webgl-conf/generated-mochitest.ini
dom/canvas/test/webgl-conf/mochitest-errata.ini
--- a/dom/canvas/test/webgl-conf/generated-mochitest.ini
+++ b/dom/canvas/test/webgl-conf/generated-mochitest.ini
@@ -4665,18 +4665,18 @@ skip-if = (os == 'android' || os == 'lin
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__canvas__drawingbuffer-test.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__canvas__framebuffer-bindings-affected-by-to-data-url.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__canvas__framebuffer-bindings-unaffected-on-resize.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__canvas__rapid-resizing.html]
-skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 fail-if = (os == 'win')
+skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__canvas__texture-bindings-unaffected-on-resize.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__canvas__to-data-url-test.html]
 skip-if = (os == 'win') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__canvas__viewport-unchanged-upon-resize.html]
 skip-if = (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
 [generated/test_2_conformance__context__context-attribute-preserve-drawing-buffer.html]
 skip-if = (os == 'win' && os_version == '6.1') || (os == 'android' || os == 'linux' || (os == 'win' && os_version == '5.1') || (os == 'win' && os_version == '6.2'))
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -681,12 +681,10 @@ skip-if = (os == 'win' && os_version == 
 skip-if = (os == 'win' && os_version == '6.1')
 
 ####################
 # failure on Windows
 [generated/test_conformance__rendering__point-specific-shader-variables.html]
 fail-if = (os == 'win' && os_version != '5.1')
 [generated/test_2_conformance__canvas__rapid-resizing.html]
 fail-if = (os == 'win')
-# Causing asserts at gfx/layers/client/CanvasClient.cpp:310, failures after test.
-skip-if = (os == 'win' && os_version == '6.1')
 [generated/test_conformance__glsl__bugs__floor-div-cos-should-not-truncate.html]
 fail-if = (os == 'win' && os_version == '5.1')