Bug 1398436 - Skip-if test_2_conformance__extensions__webgl-compressed-texture-size-limit.html in Win 7. r=jgilbert, a=test-only
authorDaosheng Mu <daoshengmu@gmail.com>
Mon, 18 Sep 2017 16:17:07 +0800
changeset 431879 1c4aa3cce409bdcc911b4b9dc7f3d4c79b618d34
parent 431878 977bae742f4f355d236d2157f6b9916525ab8001
child 431880 25a300775dbe07086c68ecea576725e65d66985a
push id7837
push userryanvm@gmail.com
push dateWed, 27 Sep 2017 17:37:56 +0000
treeherdermozilla-beta@c89417bb5ce9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert, test-only
bugs1398436
milestone57.0
Bug 1398436 - Skip-if test_2_conformance__extensions__webgl-compressed-texture-size-limit.html in Win 7. r=jgilbert, a=test-only MozReview-Commit-ID: JJBAvcLZPUZ
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
@@ -6209,18 +6209,17 @@ skip-if = (os == 'android' || os == 'lin
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-pvrtc.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc-srgb.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-size-limit.html]
-fail-if = (os == 'win' && os_version == '6.1' && debug && !e10s)
-skip-if = (os == 'android' || os == 'linux')
+skip-if = (os == 'win' && os_version == '6.1' && debug && !e10s) || (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-debug-renderer-info.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-debug-shaders.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__extensions__webgl-shared-resources.html]
 skip-if = (os == 'android' || os == 'linux')
 [generated/test_2_conformance__glsl__bugs__angle-ambiguous-function-call.html]
 skip-if = (os == 'android' || os == 'linux')
--- a/dom/canvas/test/webgl-conf/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini
@@ -932,14 +932,14 @@ skip-if = (os == 'win' && os_version == 
 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')
 [generated/test_2_conformance__extensions__webgl-compressed-texture-size-limit.html]
-# timeout on win7 debug no e10s.
-fail-if = (os == 'win' && os_version == '6.1' && debug && !e10s)
+# Frequent but intermittent timeout on win7 debug no e10s.
+skip-if = (os == 'win' && os_version == '6.1' && debug && !e10s)
 [generated/test_2_conformance2__textures__misc__tex-input-validation.html]
 skip-if = (os == 'win')
 [generated/test_2_conformance2__buffers__get-buffer-sub-data.html]
 skip-if = (os == 'win')