From 431a51bafd1d102857b70980ed9f29488f68c5a1 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sat, 5 Nov 2016 11:29:20 +0100 Subject: [PATCH] Bug 1310297 - Remove test annotations using b2g, mulet or gonk: layout/base. r=RyanVM MozReview-Commit-ID: M0EASZk09I --HG-- extra : rebase_source : e606f93a93c0f4149ba3d81d6b3893ef2b12d2da --- layout/base/crashtests/crashtests.list | 2 +- layout/base/tests/chrome/chrome.ini | 24 ++-------------------- layout/base/tests/mochitest.ini | 28 ++++++++------------------ 3 files changed, 11 insertions(+), 43 deletions(-) diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list index c98e62bb4582..d3ffeff323d7 100644 --- a/layout/base/crashtests/crashtests.list +++ b/layout/base/crashtests/crashtests.list @@ -411,7 +411,7 @@ load 709536-1.xhtml load 722137.html load 725535.html load 727601.html -skip-if(Android||B2G) asserts(0-2) pref(dom.disable_open_during_load,false) load 735943.html # the assertion is bug 735966, for android bug 760271, for b2g bug 833371 +skip-if(Android) asserts(0-2) pref(dom.disable_open_during_load,false) load 735943.html # the assertion is bug 735966, for android bug 760271 asserts(0-2) load 736389-1.xhtml # sometimes the above assertions are delayed and is reported on this test instead load 736924-1.html load 749816-1.html diff --git a/layout/base/tests/chrome/chrome.ini b/layout/base/tests/chrome/chrome.ini index 5066f6b10566..2f6ca0ba8db2 100644 --- a/layout/base/tests/chrome/chrome.ini +++ b/layout/base/tests/chrome/chrome.ini @@ -19,51 +19,31 @@ support-files = [test_bug396367-1.html] [test_bug396367-2.html] [test_bug420499.xul] -skip-if = buildapp == 'b2g' [test_bug458898.html] -skip-if = buildapp == 'b2g' [test_bug495648.xul] -skip-if = buildapp == 'b2g' [test_bug504311.xul] -skip-if = buildapp == 'b2g' [test_bug514660.xul] -skip-if = buildapp == 'b2g' [test_bug533845.xul] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' [test_bug551434.html] [test_bug708062.html] [test_bug812817.xul] -skip-if = buildapp == 'b2g' [test_bug847890_paintFlashing.html] [test_bug1018265.xul] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' [test_bug1041200.xul] -skip-if = buildapp == 'b2g' support-files=bug1041200_window.html [test_chrome_content_integration.xul] -skip-if = buildapp == 'b2g' [test_chrome_over_plugin.xul] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' [test_default_background.xul] -skip-if = buildapp == 'b2g' [test_dialog_with_positioning.html] tags = openwindow -skip-if = buildapp == 'b2g' [test_fixed_bg_scrolling_repaints.html] -skip-if = buildapp == 'b2g' [test_leaf_layers_partition_browser_window.xul] -skip-if = (!debug) || (toolkit == "cocoa") || (os == "linux") || (buildapp == 'b2g') # Disabled on Mac and Linux because of Bug 992311 +skip-if = (!debug) || (toolkit == "cocoa") || (os == "linux") # Disabled on Mac and Linux because of Bug 992311 [test_no_clip_iframe.xul] -skip-if = buildapp == 'b2g' [test_prerendered_transforms.html] -skip-if = buildapp == 'b2g' [test_printpreview.xul] -skip-if = buildapp == 'b2g' || (os == "linux" && bits == 32) # Disabled on Linux32 for bug 1278957 +skip-if = os == "linux" && bits == 32 # Disabled on Linux32 for bug 1278957 [test_printpreview_bug396024.xul] -skip-if = buildapp == 'b2g' [test_printpreview_bug482976.xul] -skip-if = buildapp == 'b2g' [test_scrolling_repaints.html] -skip-if = buildapp == 'b2g' [test_will_change.html] -skip-if = buildapp == 'b2g' diff --git a/layout/base/tests/mochitest.ini b/layout/base/tests/mochitest.ini index e5e194e28cd8..279b0af8aab4 100644 --- a/layout/base/tests/mochitest.ini +++ b/layout/base/tests/mochitest.ini @@ -1,6 +1,6 @@ [DEFAULT] -# Android: SLOW_DIRECTORY; Mulet: bug 1048441, bug 1087611, bug 1112988, etc. -skip-if = toolkit == 'android' || buildapp == 'mulet' +# Android: SLOW_DIRECTORY; +skip-if = toolkit == 'android' support-files = Ahem.ttf border_radius_hit_testing_iframe.html @@ -60,7 +60,6 @@ support-files = [test_preserve3d_sorting_hit_testing2.html] [test_after_paint_pref.html] [test_bug370436.html] -skip-if = buildapp == 'b2g' [test_bug993936.html] [test_border_radius_hit_testing.html] [test_bug66619.html] @@ -83,7 +82,7 @@ skip-if = true # Bug 492575 [test_bug423523.html] [test_bug449781.html] [test_bug450930.xhtml] -skip-if = buildapp == 'b2g' || true # bug 934301 # b2g(times out) b2g-debug(times out) b2g-desktop(times out) +skip-if = buildapp == 'b2g' || true # bug 934301 support-files = bug450930.xhtml [test_bug465448.xul] [test_bug469170.html] @@ -92,7 +91,6 @@ support-files = bug450930.xhtml [test_bug435293-interaction.html] [test_bug435293-skew.html] [test_reftests_with_caret.html] -skip-if = (toolkit == 'gonk' && debug) #debug-only timeout support-files = bug106855-1.html bug106855-2.html @@ -217,35 +215,32 @@ support-files = [test_bug582181-2.html] [test_bug588174.html] [test_bug607529.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage support-files = file_bug607529.html [test_bug667512.html] [test_bug677878.html] [test_bug696020.html] [test_event_target_radius.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # bug 1040987 [test_event_target_iframe_oop.html] skip-if = e10s # bug 1020135, nested oop iframes not supported support-files = bug921928_event_target_iframe_apps_oop.html [test_mozPaintCount.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(depends on plugins support) b2g-debug(depends on plugins support) b2g-desktop(depends on plugins support) +skip-if = toolkit == 'android' [test_scroll_event_ordering.html] [test_scroll_selection_into_view.html] -skip-if = buildapp == 'b2g' support-files=scroll_selection_into_view_window.html [test_scroll_snapping.html] skip-if = buildapp == 'android' # bug 1041833 [test_scroll_snapping_scrollbars.html] -skip-if = buildapp == 'android' || buildapp == 'b2g' || buildapp == 'b2g-debug' # android(Bug 1041833) b2g(B2G does not have clickable toolbars) b2g-debug(B2G does not have clickable toolbars) +skip-if = buildapp == 'android' # bug 1041833 [test_bug583889.html] support-files = bug583889_inner1.html bug583889_inner2.html [test_bug582771.html] [test_bug968148.html] support-files = bug968148_inner.html [test_bug603550.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) b2g-debug(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) b2g-desktop(Components.classes[@mozilla.org/widget/dragservice;1] is undefined) +skip-if = toolkit == 'android' #TIMED_OUT [test_bug629838.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(depends on plugins support) b2g-debug(depends on plugins support) b2g-desktop(depends on plugins support) +skip-if = toolkit == 'android' [test_bug646757.html] [test_bug718809.html] [test_bug725426.html] @@ -253,7 +248,6 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g [test_bug761572.html] [test_bug770106.html] [test_remote_frame.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug842853.html] [test_bug842853-2.html] [test_bug849219.html] @@ -275,7 +269,6 @@ support-files = [test_emulateMedium.html] [test_getClientRects_emptytext.html] [test_bug858459.html] -skip-if = toolkit == "gonk" || buildapp == 'mulet' || buildapp == 'b2g' #Bug 931116, b2g desktop specific, initial triage # because of bug 469208. [test_bug332655-1.html] @@ -287,9 +280,7 @@ skip-if = toolkit == 'android' [test_flush_on_paint.html] skip-if = true || (toolkit == 'android') || (toolkit == "cocoa") # Bug 688128, bug 539356 [test_getBoxQuads_convertPointRectQuad.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 948948 [test_bug687297.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') # Bug 948948 support-files = bug687297_a.html bug687297_b.html @@ -305,7 +296,7 @@ support-files = bug1080361_inner.html [test_bug1093686.html] support-files = bug1093686_inner.html [test_bug1120705.html] -skip-if = buildapp == 'android' || buildapp == 'b2g' || buildapp == 'b2g-debug' || os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # android and b2g do not have clickable scrollbars, mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme +skip-if = buildapp == 'android' || os == 'mac' || toolkit == 'gtk2' || toolkit == 'gtk3' # android does not have clickable scrollbars, mac does not have scrollbar down and up buttons, gtk may or may not have scrollbar buttons depending on theme [test_bug1153130.html] support-files = bug1153130_inner.html [test_bug1162990.html] @@ -317,11 +308,8 @@ support-files = bug1226904.html [test_bug1246622.html] [test_bug1278021.html] [test_transformed_scrolling_repaints.html] -skip-if = buildapp == 'b2g' [test_transformed_scrolling_repaints_2.html] -skip-if = buildapp == 'b2g' [test_transformed_scrolling_repaints_3.html] -skip-if = buildapp == 'b2g' [test_frame_reconstruction_scroll_restore.html] [test_resize_flush.html] support-files =