Backed out changeset 71357797bf19 (bug 1140148) for mochitest-gl harness bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 19 Mar 2015 13:44:51 -0400
changeset 263341 07a6b1f3448a99f286f936c27580177e4f4998f3
parent 263340 519e18aa7875cd70a9481150435e634dbbd8bcf5
child 263342 b3fcbf6497653ca51fc762c2444470fba7270021
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1140148
milestone39.0a1
backs out71357797bf196c6518db894d5d89c09f8533ddd0
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 71357797bf19 (bug 1140148) for mochitest-gl harness bustage. CLOSED TREE
dom/canvas/test/webgl-conformance/mochi-single.html
--- a/dom/canvas/test/webgl-conformance/mochi-single.html
+++ b/dom/canvas/test/webgl-conformance/mochi-single.html
@@ -66,19 +66,16 @@ if (!window.SimpleTest) {
 
 var OS_VERSION_WIN7 = 6.1;
 var OS_VERSION_OSX_10_6 = 10.6;
 var OS_VERSION_OSX_10_8 = 10.8;
 
 // ICS 4.0-4.0.2 was 14, 4.0.3+ was 15.
 var OS_VERSION_ANDROID_ICS = 14;
 
-// Jellybean 4.3
-var OS_VERSION_ANDROID_JB = 18;
-
 var ALWAYS_FAIL_TEST_FILEPATH = 'always-fail.html';
 
 function GetExpectedTestFailSet() {
   var failSet = {};
 
   failSet[ALWAYS_FAIL_TEST_FILEPATH] = true;
 
   switch (DriverInfo.getOS()) {
@@ -104,29 +101,17 @@ function GetExpectedTestFailSet() {
     case DriverInfo.OS.LINUX:
       failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
       failSet['conformance/misc/type-conversion-test.html'] = true;
       failSet['conformance/textures/texture-mips.html'] = true;
       failSet['conformance/textures/texture-size-cube-maps.html'] = true;
       break;
 
     case DriverInfo.OS.ANDROID:
-      if (DriverInfo.getOSVersion() == OS_VERSION_ANDROID_JB) {
-        // Android 4.3 slaves.
-        failSet['conformance/extensions/oes-texture-float.html' = true;
-        failSet['conformance/glsl/functions/glsl-function-faceforward.html'] = true;
-        failSet['conformance/glsl/functions/glsl-function-sin.html'] = true;
-        failSet['conformance/glsl/misc/object-deletion-behaviour.html'] = true;
-        failSet['conformance/textures/tex-image-with-format-and-type.html'] = true;
-        failSet['conformance/textures/texture-mips.html'] = true;
-        failSet['conformance/textures/texture-npot.html'] = true;
-        failSet['conformance/textures/texture-npot-video.html'] = true;
-        failSet['conformance/textures/texture-size-cube-maps.html'] = true;
-        failSet['conformance/uniforms/uniform-samplers-test.html'] = true;
-      } else if (DriverInfo.getOSVersion() >= OS_VERSION_ANDROID_ICS) {
+      if (DriverInfo.getOSVersion() >= OS_VERSION_ANDROID_ICS) {
         // Android 4.0 slaves.
         failSet['conformance/extensions/oes-vertex-array-object.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-abs.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-faceforward.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-sign.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-smoothstep-float.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-step-float.html'] = true;
         failSet['conformance/glsl/functions/glsl-function-step-gentype.html'] = true;