Bug 1111689 - Part 2: Update WebGL ensure-exts mochitests to expect EXT_shader_texture_lod draft
authorKearwood (Kip) Gilbert <kgilbert@mozilla.com>
Mon, 09 May 2016 11:27:33 -0700
changeset 364891 049fc56f51bdd1fea9348fc3f99d23a92989fe3c
parent 364890 168ecfbefcd62318b7061a9806c652930e20577e
child 364892 6c5a22726dedaa8cb94f7132873d185df0e0f66d
push id17596
push userkgilbert@mozilla.com
push dateMon, 09 May 2016 18:28:34 +0000
bugs1111689
milestone49.0a1
Bug 1111689 - Part 2: Update WebGL ensure-exts mochitests to expect EXT_shader_texture_lod MozReview-Commit-ID: E2UxFXJ8d1h
dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_shader_texture_lod.html
dom/canvas/test/webgl-mochitest/ensure-exts/test_common.html
dom/canvas/test/webgl-mochitest/mochitest.ini
deleted file mode 100644
--- a/dom/canvas/test/webgl-mochitest/ensure-exts/test_EXT_shader_texture_lod.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';
-EnsureExt('EXT_shader_texture_lod');
-
-    </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
@@ -29,17 +29,17 @@ do {
   // If you're adding a slave config that is missing one of these, comment the line out
   // and split it into its own test.
 
   // 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_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');
--- a/dom/canvas/test/webgl-mochitest/mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest/mochitest.ini
@@ -15,18 +15,16 @@ 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')
-[ensure-exts/test_EXT_shader_texture_lod.html]
-fail-if = (os == 'android') || (os == 'linux') || (os == 'mac')
 [ensure-exts/test_EXT_texture_filter_anisotropic.html]
 fail-if = (os == 'android') || (os == 'linux')
 [ensure-exts/test_OES_standard_derivatives.html]
 fail-if = (os == 'android')
 [ensure-exts/test_WEBGL_color_buffer_float.html]
 fail-if = (os == 'android')
 [ensure-exts/test_WEBGL_compressed_texture_atc.html]
 fail-if = (os == 'android') || (os == 'linux') || (os == 'mac') || (os == 'win')