Backed out changeset 22c42d243a5c (bug 1271830) for unexpected pass of test_EXT_color_buffer_float.html on Android. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 25 May 2016 23:44:19 +0200
changeset 299040 f59273abb81006a6bd85c8287849eacd32d63ca7
parent 299039 3b6fb13e56de5ad9a53cda7209e22eb1c51451bb
child 299041 fbcbc3e1aa5bbae2d25f6037b543ff9028e0121a
push id77412
push userarchaeopteryx@coole-files.de
push dateWed, 25 May 2016 21:44:36 +0000
treeherdermozilla-inbound@f59273abb810 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1271830
milestone49.0a1
backs out22c42d243a5cb24bd97efa201ecaa4d3c5965502
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 22c42d243a5c (bug 1271830) for unexpected pass of test_EXT_color_buffer_float.html on Android. r=backout
dom/canvas/WebGLContextExtensions.cpp
dom/canvas/test/webgl-mochitest/ensure-exts/ensure-ext.js
dom/canvas/test/webgl-mochitest/ensure-exts/test_ANGLE_instanced_arrays.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_blend_minmax.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_color_buffer_float.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_color_buffer_half_float.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_disjoint_timer_query.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_frag_depth.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_sRGB.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_shader_texture_lod.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_OES_standard_derivatives.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_color_buffer_float.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_es3.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_depth_texture.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_draw_buffers.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html
dom/canvas/test/webgl-mochitest/mochitest.ini
--- a/dom/canvas/WebGLContextExtensions.cpp
+++ b/dom/canvas/WebGLContextExtensions.cpp
@@ -107,24 +107,28 @@ WebGLContext::IsExtensionSupported(WebGL
 {
     if (mDisableExtensions)
         return false;
 
     // Extensions for both WebGL 1 and 2.
     switch (ext) {
     // In alphabetical order
     // EXT_
+    case WebGLExtensionID::EXT_color_buffer_half_float:
+        return WebGLExtensionColorBufferHalfFloat::IsSupported(this);
     case WebGLExtensionID::EXT_texture_filter_anisotropic:
         return gl->IsExtensionSupported(gl::GLContext::EXT_texture_filter_anisotropic);
 
     // OES_
     case WebGLExtensionID::OES_texture_float_linear:
         return gl->IsSupported(gl::GLFeature::texture_float_linear);
 
     // WEBGL_
+    case WebGLExtensionID::WEBGL_color_buffer_float:
+        return WebGLExtensionColorBufferFloat::IsSupported(this);
     case WebGLExtensionID::WEBGL_compressed_texture_atc:
         return gl->IsExtensionSupported(gl::GLContext::AMD_compressed_ATC_texture);
     case WebGLExtensionID::WEBGL_compressed_texture_etc1:
         return gl->IsExtensionSupported(gl::GLContext::OES_compressed_ETC1_RGB8_texture);
     case WebGLExtensionID::WEBGL_compressed_texture_pvrtc:
         return gl->IsExtensionSupported(gl::GLContext::IMG_texture_compression_pvrtc);
     case WebGLExtensionID::WEBGL_compressed_texture_s3tc:
         if (gl->IsExtensionSupported(gl::GLContext::EXT_texture_compression_s3tc))
@@ -162,18 +166,16 @@ WebGLContext::IsExtensionSupported(WebGL
         switch (ext) {
         // ANGLE_
         case WebGLExtensionID::ANGLE_instanced_arrays:
             return WebGLExtensionInstancedArrays::IsSupported(this);
 
         // EXT_
         case WebGLExtensionID::EXT_blend_minmax:
             return WebGLExtensionBlendMinMax::IsSupported(this);
-        case WebGLExtensionID::EXT_color_buffer_half_float:
-            return WebGLExtensionColorBufferHalfFloat::IsSupported(this);
         case WebGLExtensionID::EXT_frag_depth:
             return WebGLExtensionFragDepth::IsSupported(this);
         case WebGLExtensionID::EXT_shader_texture_lod:
             return gl->IsExtensionSupported(gl::GLContext::EXT_shader_texture_lod);
         case WebGLExtensionID::EXT_sRGB:
             return WebGLExtensionSRGB::IsSupported(this);
 
         // OES_
@@ -187,18 +189,16 @@ WebGLContext::IsExtensionSupported(WebGL
             return WebGLExtensionTextureHalfFloat::IsSupported(this);
         case WebGLExtensionID::OES_texture_half_float_linear:
             return gl->IsSupported(gl::GLFeature::texture_half_float_linear);
 
         case WebGLExtensionID::OES_vertex_array_object:
             return true;
 
         // WEBGL_
-        case WebGLExtensionID::WEBGL_color_buffer_float:
-            return WebGLExtensionColorBufferFloat::IsSupported(this);
         case WebGLExtensionID::WEBGL_depth_texture:
             // WEBGL_depth_texture supports DEPTH_STENCIL textures
             if (!gl->IsSupported(gl::GLFeature::packed_depth_stencil))
                 return false;
 
             return gl->IsSupported(gl::GLFeature::depth_texture) ||
                    gl->IsExtensionSupported(gl::GLContext::ANGLE_depth_texture);
         case WebGLExtensionID::WEBGL_draw_buffers:
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/ensure-ext.js
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/ensure-ext.js
@@ -1,38 +1,26 @@
 'use strict';
 
-function EnsureExt(extName, shouldHave=true) {
-    EnsureExtFor('webgl', extName, shouldHave);
-    EnsureExtFor('webgl2', extName, shouldHave);
-}
-
-function EnsureExtFor(contextType, extName, shouldHave=true) {
+function EnsureExt(name, shouldBe = true) {
     var c = document.createElement('canvas');
-    var gl = c.getContext(contextType);
+    var gl = c.getContext('experimental-webgl');
 
-    if (!gl) {
-        todo(false, 'Failed to create context: ' + contextType);
-        return;
-    }
-
-    var ext = gl.getExtension(extName);
-    var haveText = ' have ' + contextType + ' extension ' + extName + '.';
-    if (shouldHave) {
-        ok(ext, 'Should' + haveText);
+    if (shouldBe) {
+        ok(gl.getExtension(name), 'Should have extension ' + name + '.');
     } else {
-        ok(!ext, 'Should not' + haveText);
+        ok(!gl.getExtension(name), 'Should not have extension ' + name + '.');
     }
 }
 
-function Lastly_WithDraftExtsEnabled(func) {
+function EnsureDraftExt(name, shouldBe = true) {
     SimpleTest.waitForExplicitFinish();
 
     var fnEnsure = function() {
-        func();
+        EnsureExt(name, shouldBe);
         SimpleTest.finish();
     };
 
     if ('SpecialPowers' in window) {
         var prefStateList = [
             ['webgl.enable-draft-extensions', true],
         ];
         var prefEnv = {'set': prefStateList};
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_ANGLE_instanced_arrays.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_ANGLE_instanced_arrays.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'ANGLE_instanced_arrays');
+EnsureExt('ANGLE_instanced_arrays');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_blend_minmax.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_blend_minmax.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'EXT_blend_minmax');
+EnsureExt('EXT_blend_minmax');
 
     </script>
   </body>
 </html>
deleted file mode 100644
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_color_buffer_float.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-  <head>
-    <meta charset='utf-8'/>
-    <script src='/tests/SimpleTest/SimpleTest.js'></script>
-    <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
-    <script src='ensure-ext.js'></script>
-  </head>
-  <body>
-    <script>
-
-'use strict';
-EnsureExtFor('webgl2', 'EXT_color_buffer_float');
-
-    </script>
-  </body>
-</html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_color_buffer_half_float.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_color_buffer_half_float.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'EXT_color_buffer_half_float');
+EnsureExt('EXT_color_buffer_half_float');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_disjoint_timer_query.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_disjoint_timer_query.html
@@ -5,15 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-Lastly_WithDraftExtsEnabled(function() {
-    EnsureExt('EXT_disjoint_timer_query');
-});
+EnsureDraftExt('EXT_disjoint_timer_query');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_frag_depth.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_frag_depth.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'EXT_frag_depth');
+EnsureExt('EXT_frag_depth');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_sRGB.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_sRGB.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'EXT_sRGB');
+EnsureExt('EXT_sRGB');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_shader_texture_lod.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_shader_texture_lod.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'EXT_shader_texture_lod');
+EnsureExt('EXT_shader_texture_lod');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_OES_standard_derivatives.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_OES_standard_derivatives.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'OES_standard_derivatives');
+EnsureExt('OES_standard_derivatives');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_color_buffer_float.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_color_buffer_float.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'WEBGL_color_buffer_float');
+EnsureExt('WEBGL_color_buffer_float');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_es3.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_compressed_texture_es3.html
@@ -5,15 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-Lastly_WithDraftExtsEnabled(function() {
-    EnsureExt('WEBGL_compressed_texture_es3');
-});
+EnsureDraftExt('WEBGL_compressed_texture_es3');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_depth_texture.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_depth_texture.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'WEBGL_depth_texture');
+EnsureExt('WEBGL_depth_texture');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_draw_buffers.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_WEBGL_draw_buffers.html
@@ -5,13 +5,13 @@
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
     <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
-EnsureExtFor('webgl', 'WEBGL_draw_buffers');
+EnsureExt('WEBGL_draw_buffers');
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html
+++ b/dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html
@@ -1,110 +1,75 @@
 <!DOCTYPE HTML>
 <html>
   <head>
     <meta charset='utf-8'/>
     <script src='/tests/SimpleTest/SimpleTest.js'></script>
     <link rel='stylesheet' href='/tests/SimpleTest/test.css'>
-    <script src='ensure-ext.js'></script>
   </head>
   <body>
     <script>
 
 'use strict';
 
-var ENSURE = 'ENSURE'; // Works on all test machines.
-var FORBID = 'FORBID'; // Should not work on any test machine.
-var MACHINE_SPECIFIC = 'MACHINE_SPECIFIC';
-
-var defaultExts = [
-    // Ratified
-    ['ANGLE_instanced_arrays'        , [MACHINE_SPECIFIC, FORBID          ]],
-    ['EXT_blend_minmax'              , [MACHINE_SPECIFIC, FORBID          ]],
-    ['EXT_frag_depth'                , [MACHINE_SPECIFIC, FORBID          ]],
-    ['EXT_shader_texture_lod'        , [MACHINE_SPECIFIC, FORBID          ]],
-    ['EXT_texture_filter_anisotropic', [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
-    ['OES_element_index_uint'        , [ENSURE          , FORBID          ]],
-    ['OES_standard_derivatives'      , [MACHINE_SPECIFIC, FORBID          ]],
-    ['OES_texture_float'             , [ENSURE          , FORBID          ]],
-    ['OES_texture_float_linear'      , [ENSURE          , ENSURE          ]],
-    ['OES_texture_half_float'        , [ENSURE          , FORBID          ]],
-    ['OES_texture_half_float_linear' , [ENSURE          , FORBID          ]],
-    ['OES_vertex_array_object'       , [ENSURE          , FORBID          ]],
-    ['WEBGL_compressed_texture_s3tc' , [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
-//  ['WEBGL_debug_renderer_info'     , [FORBID          , FORBID          ]], // Complicated!
-    ['WEBGL_debug_shaders'           , [FORBID          , FORBID          ]],
-    ['WEBGL_depth_texture'           , [MACHINE_SPECIFIC, FORBID          ]],
-    ['WEBGL_draw_buffers'            , [MACHINE_SPECIFIC, FORBID          ]],
-    ['WEBGL_lose_context'            , [ENSURE          , ENSURE          ]],
+var c = document.createElement('canvas');
+var gl = c.getContext('experimental-webgl');
 
-    // Community Approved
-    ['EXT_color_buffer_float'        , [FORBID          , MACHINE_SPECIFIC]],
-    ['EXT_color_buffer_half_float'   , [MACHINE_SPECIFIC, FORBID          ]],
-    ['EXT_sRGB'                      , [MACHINE_SPECIFIC, FORBID          ]],
-    ['WEBGL_color_buffer_float'      , [MACHINE_SPECIFIC, FORBID          ]],
-    ['WEBGL_compressed_texture_atc'  , [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
-    ['WEBGL_compressed_texture_etc1' , [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
-    ['WEBGL_compressed_texture_pvrtc', [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
-];
-
-var draftExts = [
-    ['EXT_disjoint_timer_query'    , [MACHINE_SPECIFIC, MACHINE_SPECIFIC]], // TODO: Actually Community Approved now.
-    ['WEBGL_compressed_texture_es3', [MACHINE_SPECIFIC, MACHINE_SPECIFIC]],
-];
+function ensureExt(name) {
+  ok(gl.getExtension(name), 'Should have extension ' + name + '.');
+}
 
-var nonImplementedExts = [
-    'OES_fbo_render_mipmap',
-    'WEBGL_compressed_texture_astc',
-    'WEBGL_security_sensitive_resources',
-    'WEBGL_shared_resources',
-];
-
-////////////////////
-
-function TestExtFor(contextType, extName, status) {
-    switch (status) {
-    case ENSURE:
-        EnsureExtFor(contextType, extName);
-        break;
-
-    case FORBID:
-        EnsureExtFor(contextType, extName, false);
-        break;
-
-    case MACHINE_SPECIFIC:
-        break;
-    }
+function ensureNoExt(name) {
+  ok(!gl.getExtension(name), 'Should not have extension ' + name + '.');
 }
 
-function TestExt(extName, statusArr) {
-    TestExtFor('webgl', extName, statusArr[0]);
-    TestExtFor('webgl2', extName, statusArr[1]);
-}
+do {
+  if (!gl)
+    break;
 
-////////////////////
-
-defaultExts.forEach(function(x) {
-    var extName = x[0];
-    var statusArr = x[1];
-    TestExt(extName, statusArr);
-});
+  // These aren't all guaranteed, but they're common to all our test slaves.
+  // If you're adding a slave config that is missing one of these, comment the line out
+  // and split it into its own test.
 
-nonImplementedExts.forEach(function(extName) {
-    EnsureExt(extName, false);
-});
+  // Implemented. (commented out if not test-slave-universal)
+  //ensureExt('ANGLE_instanced_arrays');
+  //ensureExt('EXT_blend_minmax');
+  //ensureExt('EXT_color_buffer_half_float');
+  //ensureExt('EXT_frag_depth');
+  //ensureExt('EXT_shader_texture_lod');
+  //ensureExt('EXT_sRGB');
+  //ensureExt('EXT_texture_filter_anisotropic');
+  ensureExt('OES_element_index_uint');
+  //ensureExt('OES_standard_derivatives');
+  ensureExt('OES_texture_float');
+  ensureExt('OES_texture_float_linear');
+  ensureExt('OES_texture_half_float');
+  ensureExt('OES_texture_half_float_linear');
+  ensureExt('OES_vertex_array_object');
+  //ensureExt('WEBGL_color_buffer_float');
+  //ensureExt('WEBGL_compressed_texture_atc');
+  //ensureExt('WEBGL_compressed_texture_es3');
+  //ensureExt('WEBGL_compressed_texture_etc1');
+  //ensureExt('WEBGL_compressed_texture_pvrtc');
+  //ensureExt('WEBGL_compressed_texture_s3tc');
+  //ensureExt('WEBGL_depth_texture');
+  //ensureExt('WEBGL_draw_buffers');
+  ensureExt('WEBGL_lose_context');
 
-draftExts.forEach(function(x) {
-    var extName = x[0];
-    EnsureExt(extName, false);
-});
+  // Draft extensions, which should not be exposed by default.
+  ensureNoExt('EXT_disjoint_timer_query');
+  ensureNoExt('WEBGL_compressed_texture_es3');
 
-Lastly_WithDraftExtsEnabled(function() {
-    draftExts.forEach(function(x) {
-        var extName = x[0];
-        var statusArr = x[1];
-        TestExt(extName, statusArr);
-    });
-});
+  // Not implemented.
+  ensureNoExt('EXT_color_buffer_float');
+  ensureNoExt('OES_fbo_render_mipmap');
+  ensureNoExt('WEBGL_compressed_texture_astc');
+  ensureNoExt('WEBGL_security_sensitive_resources');
+  ensureNoExt('WEBGL_shared_resources');
+
+  // Privileged
+  //ensureExt('WEBGL_debug_renderer_info');
+  //ensureExt('WEBGL_debug_shaders');
+} while (false);
 
     </script>
   </body>
 </html>
--- a/dom/canvas/test/webgl-mochitest/mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest/mochitest.ini
@@ -7,18 +7,16 @@ support-files =
   driver-info.js
   es3-data.js
   webgl-util.js
 
 [ensure-exts/test_ANGLE_instanced_arrays.html]
 fail-if = (os == 'android') || (os == 'mac' && os_version == '10.6')
 [ensure-exts/test_EXT_blend_minmax.html]
 fail-if = (os == 'android')
-[ensure-exts/test_EXT_color_buffer_float.html]
-fail-if = (os == 'android')
 [ensure-exts/test_EXT_color_buffer_half_float.html]
 fail-if = (os == 'android')
 [ensure-exts/test_EXT_disjoint_timer_query.html]
 fail-if = (os == 'android') || (os == 'mac') || (os == 'win')
 [ensure-exts/test_EXT_frag_depth.html]
 fail-if = (os == 'android')
 [ensure-exts/test_EXT_sRGB.html]
 fail-if = (os == 'android') || (os == 'mac' && os_version == '10.6') || (os == 'win')