Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/canvas. r=RyanVM
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:15 +0100
changeset 321145 72f599526c3ea74c4a4fb1afffdc27b4b8f31a51
parent 321144 a6711dd19615486c63189716ba940b7c9c0c97c5
child 321146 8b48318b227cda5bb06989a342d6a37f37269c0e
push id30919
push userphilringnalda@gmail.com
push dateSat, 05 Nov 2016 20:28:20 +0000
treeherdermozilla-central@572249b2ffb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1310297
milestone52.0a1
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
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/canvas. r=RyanVM MozReview-Commit-ID: BwxncEs6Pfv
dom/canvas/crashtests/crashtests.list
dom/canvas/test/chrome/chrome.ini
dom/canvas/test/mochitest.ini
dom/canvas/test/reftest/reftest.list
dom/canvas/test/webgl-mochitest/mochitest.ini
--- a/dom/canvas/crashtests/crashtests.list
+++ b/dom/canvas/crashtests/crashtests.list
@@ -4,20 +4,20 @@ load 360293-1.html
 load 421715-1.html
 load 553938-1.html
 load 647480.html
 load 727547.html
 load 729116.html
 load 745699-1.html
 load 746813-1.html
 load 743499-negative-size.html
-skip-if(Android||B2G) load 745818-large-source.html # Bug XXX - Crashes Android/B2G mid-run w/o a stack
+skip-if(Android) load 745818-large-source.html # Bug XXX - Crashes Android mid-run w/o a stack
 load 767337-1.html
-skip-if(Android||B2G) load 780392-1.html # bug 833371 for B2G
-skip-if(Android||B2G) skip-if(gtkWidget&&isDebugBuild) load 789933-1.html # bug 833371 for B2G, bug 1155252 for linux
+skip-if(Android) load 780392-1.html
+skip-if(Android) skip-if(gtkWidget&&isDebugBuild) load 789933-1.html # bug 1155252 for linux
 load 794463-1.html
 load 802926-1.html
 load 896047-1.html
 load 916128-1.html
 load 934939-1.html
 load 1099143-1.html
 load 1161277-1.html
 load 1183363.html
--- a/dom/canvas/test/chrome/chrome.ini
+++ b/dom/canvas/test/chrome/chrome.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files = nonchrome_webgl_debug_renderer_info.html
 
 [test_webgl_debug_renderer_info.html]
 subsuite = gpu
 [test_drawWindow_widget_layers.html]
 support-files = ../file_drawWindow_source.html ../file_drawWindow_common.js
--- a/dom/canvas/test/mochitest.ini
+++ b/dom/canvas/test/mochitest.ini
@@ -149,28 +149,28 @@ skip-if = toolkit != 'cocoa'
 # See bug 512647.
 [test_2d.gradient.radial.cone.shape2.html]
 disabled = bug 512647
 [test_2d.gradient.radial.cone.behind.html]
 disabled = bug 512647
 [test_2d.gradient.radial.cone.beside.html]
 disabled = bug 512647
 # This is an issue with Quartz's handling of radial gradients and some numeric
-# imprecision that results in errors here. SkiaGL (on Android/Gonk) also has
+# imprecision that results in errors here. SkiaGL (on Android) also has
 # a similar problem.
 [test_2d.gradient.radial.inside2.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'cocoa' || toolkit == 'android'
 [test_2d.gradient.radial.inside3.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'cocoa' || toolkit == 'android'
 [test_2d.gradient.radial.outside1.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'cocoa' || toolkit == 'android'
 [test_2d.gradient.radial.cone.front.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'cocoa' || toolkit == 'android'
 [test_2d.gradient.radial.cone.top.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'cocoa' || toolkit == 'android'
 # Tests that fail on non-Mac (bug 407107)
 [test_2d.gradient.radial.outside2.html]
 skip-if = toolkit != 'cocoa'
 [test_2d.gradient.radial.outside3.html]
 disabled = bug 1038277
 # These tests only pass on Mac OS X >= 10.5; see bug 450114
 [test_2d.gradient.radial.touch1.html]
 disabled = bug 450114
@@ -201,38 +201,36 @@ skip-if = toolkit != 'cocoa'
 disabled = bug 407107
 [test_2d.strokeRect.zero.5.html]
 [test_bitmaprenderer.html]
 [test_bug232227.html]
 [test_bug613794.html]
 [test_bug764125.html]
 [test_bug856472.html]
 [test_bug866575.html]
-skip-if = (toolkit == 'gonk' && debug) #bug 1045153
 [test_bug902651.html]
 [test_bug1215072.html]
 subsuite = gpu
 [test_canvas.html]
-skip-if = (toolkit == 'gonk' && debug) || (android_version == '18' && debug) #debug-only crash; bug 933541 #android 4.3 debug bug 1143317
+skip-if = (android_version == '18' && debug) #android 4.3 debug bug 1143317
 [test_canvas_focusring.html]
-skip-if = (toolkit == 'gonk' && !debug) || os == 'win' #specialpowers.wrap
+skip-if = os == 'win'
 [test_canvas_font_setter.html]
 [test_canvas_path.html]
 [test_hitregion_canvas.html]
 [test_hitregion_event.html]
-skip-if = os == "android" || appname == "b2g"
+skip-if = os == "android"
 [test_canvas_strokeStyle_getter.html]
 [test_capture.html]
 support-files = captureStream_common.js
 [test_drawImageIncomplete.html]
 [test_drawImage_document_domain.html]
 [test_drawImage_edge_cases.html]
 [test_drawWindow.html]
 support-files = file_drawWindow_source.html file_drawWindow_common.js
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk')
 [test_imagebitmap.html]
 tags = imagebitmap
 [test_imagebitmap_close.html]
 tags = imagebitmap
 [test_imagebitmap_cropping.html]
 tags = imagebitmap
 [test_imagebitmap_extensions.html]
 tags = imagebitmap
@@ -253,17 +251,16 @@ tags = imagebitmap
 [test_mozGetAsFile.html]
 [test_strokeText_throw.html]
 [test_toBlob.html]
 [test_toDataURL_alpha.html]
 [test_toDataURL_lowercase_ascii.html]
 [test_toDataURL_parameters.html]
 [test_windingRuleUndefined.html]
 [test_2d.fillText.gradient.html]
-skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # bug 1040965
 [test_2d_composite_canvaspattern_setTransform.html]
 [test_createPattern_broken.html]
 [test_filter.html]
 skip-if = (e10s && debug && os == 'win')
 [test_filter_tainted.html]
 [test_offscreencanvas_toblob.html]
 subsuite = gpu
 tags = offscreencanvas
--- a/dom/canvas/test/reftest/reftest.list
+++ b/dom/canvas/test/reftest/reftest.list
@@ -122,27 +122,28 @@ skip-if(Android) pref(webgl.force-layers
 skip-if(Android) == webgl-hanging-scissor-test.html?__  wrapper.html?green.png
 skip-if(Android) == webgl-hanging-scissor-test.html?aa  wrapper.html?green.png
 skip-if(Android) pref(webgl.force-layers-readback,true)  == webgl-hanging-scissor-test.html?readback&__  wrapper.html?green.png
 skip-if(Android) pref(webgl.force-layers-readback,true)  == webgl-hanging-scissor-test.html?readback&aa  wrapper.html?green.png
 
 
 # Check that our experimental prefs still work:
 
-# 16bpp for Android/B2G: [16bpp] * PowerSet([readback, premult, alpha])
+# 16bpp for Android: [16bpp] * PowerSet([readback, premult, alpha])
 # RGB565 dithers 127 to [123,132]. (Max error: 5)
 # RGBA4444 dithers 128 to [119,136], and 191 to [192]. (Max error: 9)
-fuzzy(5,30000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&_______&_____  wrapper.html?colors-no-alpha.png
-fuzzy(5,30000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&_______&_____  wrapper.html?colors-no-alpha.png
-fuzzy(5,30000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&premult&_____  wrapper.html?colors-no-alpha.png
-fuzzy(5,30000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&premult&_____  wrapper.html?colors-no-alpha.png
-fuzzy(9,40000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&_______&alpha  wrapper.html?colors-non-premult.png
-fuzzy(9,40000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&_______&alpha  wrapper.html?colors-non-premult.png
-fuzzy(9,40000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&premult&alpha  wrapper.html?colors-premult.png
-fuzzy(9,40000) skip-if(!(Android||B2G)) skip-if(Android) pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&premult&alpha  wrapper.html?colors-premult.png
+# Bug 1285531 - tests disabled for memory corruption
+fuzzy(5,30000) skip pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&_______&_____  wrapper.html?colors-no-alpha.png
+fuzzy(5,30000) skip pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&_______&_____  wrapper.html?colors-no-alpha.png
+fuzzy(5,30000) skip pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&premult&_____  wrapper.html?colors-no-alpha.png
+fuzzy(5,30000) skip pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&premult&_____  wrapper.html?colors-no-alpha.png
+fuzzy(9,40000) skip pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&_______&alpha  wrapper.html?colors-non-premult.png
+fuzzy(9,40000) skip pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&_______&alpha  wrapper.html?colors-non-premult.png
+fuzzy(9,40000) skip pref(webgl.prefer-16bpp,true)                                         == webgl-color-test.html?16bpp&________&premult&alpha  wrapper.html?colors-premult.png
+fuzzy(9,40000) skip pref(webgl.prefer-16bpp,true) pref(webgl.force-layers-readback,true)  == webgl-color-test.html?16bpp&readback&premult&alpha  wrapper.html?colors-premult.png
 
 # Force native GL (Windows):
 skip-if(!winWidget) pref(webgl.disable-angle,true)  == webgl-color-test.html?native-gl  wrapper.html?colors-no-alpha.png
 
 
 # Non-WebGL Reftests!
 
 # Do we correctly handle multiple clip paths?
@@ -151,18 +152,18 @@ skip-if(!winWidget) pref(webgl.disable-a
 # Bug 1255062
 == clip-multiple-move-1.html clip-multiple-move-1-ref.html
 == clip-multiple-move-2.html clip-multiple-move-2-ref.html
 
 # Bug 815648
 == stroketext-shadow.html stroketext-shadow-ref.html
 
 # focus rings
-pref(canvas.focusring.enabled,true) skip-if(B2G) skip-if(cocoaWidget) skip-if(winWidget) needs-focus == drawFocusIfNeeded.html drawFocusIfNeeded-ref.html
-pref(canvas.customfocusring.enabled,true) skip-if(B2G) skip-if(cocoaWidget) skip-if(Android) skip-if(winWidget) fuzzy-if(gtkWidget,64,410) needs-focus == drawCustomFocusRing.html drawCustomFocusRing-ref.html
+pref(canvas.focusring.enabled,true) skip-if(cocoaWidget) skip-if(winWidget) needs-focus == drawFocusIfNeeded.html drawFocusIfNeeded-ref.html
+pref(canvas.customfocusring.enabled,true) skip-if(Android||cocoaWidget||winWidget) fuzzy-if(gtkWidget,64,410) needs-focus == drawCustomFocusRing.html drawCustomFocusRing-ref.html
 
 # Check that captureStream() displays in a local video element
 == capturestream.html wrapper.html?green.png
 
 fuzzy-if(azureSkia,16,2) fuzzy-if(Android,3,40) fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),1,1) == 1177726-text-stroke-bounds.html 1177726-text-stroke-bounds-ref.html
 
 # Canvas Filter Reftests
 include filters/reftest.list
--- a/dom/canvas/test/webgl-mochitest/mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest/mochitest.ini
@@ -1,11 +1,10 @@
 [DEFAULT]
 subsuite = webgl
-skip-if = ((os == 'linux') && (buildapp == 'b2g'))
 
 support-files =
   ensure-exts/ensure-ext.js
   driver-info.js
   es3-data.js
   webgl-util.js
 
 [ensure-exts/test_ANGLE_instanced_arrays.html]
@@ -46,30 +45,28 @@ fail-if = (os == 'android') || (os == 'w
 [ensure-exts/test_common.html]
 
 
 [regress/test_bug_1268096.html]
 
 
 [test_backends.html]
 [test_backbuffer_channels.html]
-fail-if = (os == 'b2g')
 [test_depth_readpixels.html]
 [test_canvas_size.html]
 [test_capture.html]
 support-files = ../captureStream_common.js
 # Even though we use ../ here, in the test HTML, we need to omit this. Sub-CWD relative
 # paths are fine, but they locate the file and dump it in the current directory.
 [test_cubemap_must_be_square.html]
 [test_depth_tex_lazy_clear.html]
 [test_draw.html]
 [test_fb_param.html]
 [test_fb_param_crash.html]
 [test_hidden_alpha.html]
-skip-if = (os == 'b2g') || buildapp == 'mulet' # Mulet - bug 1093639 (crashes in libLLVM-3.0.so)
 [test_hidden_depth_stencil.html]
 fail-if = (os == 'win' && os_version == '5.1')
 [test_implicit_color_buffer_float.html]
 [test_highp_fs.html]
 [test_no_arr_points.html]
 skip-if = android_version == '18' #Android 4.3 aws only; bug 1030942
 [test_noprog_draw.html]
 [test_pixel_pack_buffer.html]