Bug 1099175 - Skip conformance/textures/texture-npot.html on android. r=jgilbert, a=test-only
authorGeoff Brown <gbrown@mozilla.com>
Fri, 27 Feb 2015 13:15:01 -0700
changeset 250155 70787b6f48c3
parent 250154 7b3c7ba30dfe
child 250156 5334c7c0b2ce
push id4515
push userryanvm@gmail.com
push date2015-03-02 23:33 +0000
treeherdermozilla-beta@082769bdd62a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgilbert, test-only
bugs1099175
milestone37.0
Bug 1099175 - Skip conformance/textures/texture-npot.html on android. r=jgilbert, a=test-only
dom/canvas/test/_webgl-conformance.ini
dom/canvas/test/webgl-conformance/mochi-single.html
dom/canvas/test/webgl-conformance/mochitest-errata.ini
--- a/dom/canvas/test/_webgl-conformance.ini
+++ b/dom/canvas/test/_webgl-conformance.ini
@@ -765,16 +765,17 @@ skip-if = (os == 'android') || (os == 'b
 [webgl-conformance/_wrappers/test_conformance__textures__texture-active-bind-2.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-active-bind.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-complete.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-formats-test.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-mips.html]
 [webgl-conformance/_wrappers/test_conformance__textures__texture-npot-video.html]
 skip-if = os == 'win'
 [webgl-conformance/_wrappers/test_conformance__textures__texture-npot.html]
+skip-if = os == 'android'
 [webgl-conformance/_wrappers/test_conformance__textures__texture-size.html]
 skip-if = os == 'android'
 [webgl-conformance/_wrappers/test_conformance__textures__texture-size-cube-maps.html]
 skip-if = os == 'android'
 [webgl-conformance/_wrappers/test_conformance__textures__texture-transparent-pixels-initialized.html]
 [webgl-conformance/_wrappers/test_conformance__typedarrays__array-buffer-crash.html]
 [webgl-conformance/_wrappers/test_conformance__typedarrays__array-buffer-view-crash.html]
 [webgl-conformance/_wrappers/test_conformance__typedarrays__array-unit-tests.html]
--- a/dom/canvas/test/webgl-conformance/mochi-single.html
+++ b/dom/canvas/test/webgl-conformance/mochi-single.html
@@ -117,17 +117,16 @@ function GetExpectedTestFailSet() {
         failSet['conformance/glsl/functions/glsl-function-step-gentype.html'] = true;
         failSet['conformance/limits/gl-max-texture-dimensions.html'] = true;
         failSet['conformance/limits/gl-min-textures.html'] = true;
         failSet['conformance/rendering/draw-elements-out-of-bounds.html'] = true;
         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-npot.html'] = true;
         failSet['conformance/textures/texture-size-cube-maps.html'] = true;
       } else {
         // Android 2.3 slaves.
         failSet['conformance/extensions/oes-texture-float.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
         failSet['conformance/misc/object-deletion-behaviour.html'] = true;
         failSet['conformance/textures/tex-image-and-sub-image-2d-with-video.html'] = true;
         failSet['conformance/textures/texture-mips.html'] = true;
--- a/dom/canvas/test/webgl-conformance/mochitest-errata.ini
+++ b/dom/canvas/test/webgl-conformance/mochitest-errata.ini
@@ -62,16 +62,19 @@ skip-if = os == 'android'
 # Crashes on Android.
 skip-if = os == 'android'
 [_wrappers/test_conformance__textures__texture-size.html]
 # Crashes on Android 4.0.
 skip-if = os == 'android'
 [_wrappers/test_conformance__textures__texture-size-cube-maps.html]
 # Crashes on Android 4.0.
 skip-if = os == 'android'
+[_wrappers/test_conformance__textures__texture-npot.html]
+# Intermittent fail on Android 4.0.
+skip-if = os == 'android'
 
 ########################################################################
 # B2G
 [_wrappers/test_conformance__context__context-attributes-alpha-depth-stencil-antialias.html]
 # Asserts on 'B2G ICS Emulator Debug'.
 skip-if = (os == 'b2g')
 [_wrappers/test_conformance__textures__tex-image-and-uniform-binding-bugs.html]
 # Intermittently asserts on 'B2G ICS Emulator Debug'.