diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build index c58a2e68ab9..ffa942025ce 100644 --- a/dom/canvas/moz.build +++ b/dom/canvas/moz.build @@ -7,7 +7,7 @@ TEST_DIRS += ['compiledtest'] # Number changes to this file to avoid bug 1081323 (clobber after changing a manifest): -# 2 +# 3 MOCHITEST_MANIFESTS += [ 'test/crossorigin/mochitest.ini', diff --git a/dom/canvas/test/webgl-mochitest.ini b/dom/canvas/test/webgl-mochitest.ini index bca7eca5fa3..d6cd17dd6b4 100644 --- a/dom/canvas/test/webgl-mochitest.ini +++ b/dom/canvas/test/webgl-mochitest.ini @@ -30,13 +30,13 @@ skip-if = android_version == '10' || android_version == '18' #Android 2.3 and 4. [webgl-mochitest/test_texsubimage_float.html] [webgl-mochitest/test_uninit_data.html] [webgl-mochitest/test_webgl_available.html] -skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests #[webgl-mochitest/test_webgl_color_buffer_float.html] # We haven't cleaned up the Try results yet, but let's get this on the books first. [webgl-mochitest/test_webgl_conformance.html] skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests [webgl-mochitest/test_webgl_compressed_texture_es3.html] [webgl-mochitest/test_webgl_disjoint_timer_query.html] +[webgl-mochitest/test_webgl_force_enable.html] [webgl-mochitest/test_webgl_request_context.html] skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests [webgl-mochitest/test_webgl_request_mismatch.html] diff --git a/dom/canvas/test/webgl-mochitest/test_webgl_available.html b/dom/canvas/test/webgl-mochitest/test_webgl_available.html index 4b4611dd2db..f6817c98582 100644 --- a/dom/canvas/test/webgl-mochitest/test_webgl_available.html +++ b/dom/canvas/test/webgl-mochitest/test_webgl_available.html @@ -1,50 +1,19 @@ -
-