Bug 1296644 - Allow test_2_conformance__canvas__rapid-resizing.html to pass on Win 7. r=jmaher, a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Fri, 19 Aug 2016 10:54:11 -0600
changeset 347751 71313593e2458fe97824d2419c17f8ec7766e7fb
parent 347750 9aea5a70f2679e59ad80a66785215a10c7073928
child 347752 0e4499ae0f81b2fe9e349f66934f7a2bfbf04035
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher, test-only
bugs1296644
milestone50.0a2
Bug 1296644 - Allow test_2_conformance__canvas__rapid-resizing.html to pass on Win 7. r=jmaher, a=test-only
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
@@ -4657,17 +4657,17 @@ 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]
-fail-if = (os == 'win')
+fail-if = (os == 'win' && os_version != '6.1')
 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]
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -663,11 +663,11 @@ skip-if = (os == 'win' && os_version == 
 # 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' && os_version != '5.1')
 [generated/test_2_conformance__canvas__rapid-resizing.html]
-fail-if = (os == 'win')
+fail-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')