From 41d0a78bc27a4407b781e7739d2b07f8aef56ebf Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sat, 5 Nov 2016 11:29:18 +0100 Subject: [PATCH] Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/tests. r=RyanVM MozReview-Commit-ID: 83L2jqWhzZe --HG-- extra : rebase_source : 58c7339e13a0abdb3da2c6ccd2dc424b51869b08 --- dom/tests/browser/browser.ini | 57 ++++----- dom/tests/mochitest/ajax/jquery/mochitest.ini | 2 +- .../mochitest/ajax/offline/mochitest.ini | 36 +----- .../mochitest/ajax/prototype/mochitest.ini | 2 +- .../ajax/scriptaculous/mochitest.ini | 2 +- dom/tests/mochitest/beacon/chrome.ini | 2 +- dom/tests/mochitest/beacon/mochitest.ini | 1 - dom/tests/mochitest/bugs/mochitest.ini | 36 ++---- dom/tests/mochitest/chrome/chrome.ini | 3 +- dom/tests/mochitest/dom-level0/mochitest.ini | 2 +- dom/tests/mochitest/fetch/mochitest.ini | 14 +- dom/tests/mochitest/gamepad/mochitest.ini | 1 - dom/tests/mochitest/general/chrome.ini | 6 +- dom/tests/mochitest/general/mochitest.ini | 121 ++++++++---------- dom/tests/mochitest/localstorage/chrome.ini | 2 +- .../mochitest/localstorage/mochitest.ini | 21 ++- dom/tests/mochitest/orientation/mochitest.ini | 1 - dom/tests/mochitest/pointerlock/mochitest.ini | 2 +- dom/tests/mochitest/sessionstorage/chrome.ini | 1 - .../mochitest/sessionstorage/mochitest.ini | 8 +- .../mochitest/storageevent/mochitest.ini | 1 - dom/tests/mochitest/whatwg/chrome.ini | 1 - dom/tests/mochitest/whatwg/mochitest.ini | 2 +- dom/tests/reftest/reftest.list | 10 +- dom/tests/unit/xpcshell.ini | 1 - 25 files changed, 126 insertions(+), 209 deletions(-) diff --git a/dom/tests/browser/browser.ini b/dom/tests/browser/browser.ini index 0489d73c201b..f69118f8ebb5 100644 --- a/dom/tests/browser/browser.ini +++ b/dom/tests/browser/browser.ini @@ -12,36 +12,33 @@ support-files = test_largeAllocation.html^headers^ !/dom/tests/mochitest/geolocation/network_geolocation.sjs -[browser_test_toolbars_visibility.js] -support-files = - test_new_window_from_content_child.html -[browser_bug1008941_dismissGeolocationHanger.js] -skip-if = buildapp == 'mulet' -[browser_test__content.js] -[browser_ConsoleAPITests.js] -skip-if = e10s -[browser_ConsoleAPI_originAttributes.js] -[browser_ConsoleStorageAPITests.js] -[browser_ConsoleStoragePBTest_perwindowpb.js] -[browser_autofocus_background.js] -skip-if= buildapp == 'mulet' -[browser_autofocus_preference.js] -[browser_bug1238427.js] -[browser_bug396843.js] -[browser_focus_steal_from_chrome.js] -[browser_focus_steal_from_chrome_during_mousedown.js] -[browser_frame_elements.js] -[browser_localStorage_privatestorageevent.js] -[browser_test_new_window_from_content.js] -tags = openwindow -skip-if = (toolkit == 'android' || buildapp == 'b2g' || buildapp == 'mulet') || (os == "linux" && debug) # see bug 1261495 for Linux debug time outs -support-files = - test_new_window_from_content_child.html -[browser_xhr_sandbox.js] -skip-if= buildapp == 'mulet' -[browser_bug1004814.js] -[browser_largeAllocation.js] -skip-if = !e10s # Large-Allocation requires e10s [browser_allocateGigabyte.js] disabled = Does not reliably pass on 32-bit systems - bug 1314098 skip-if = !e10s +[browser_autofocus_background.js] +[browser_autofocus_preference.js] +[browser_bug396843.js] +[browser_bug1004814.js] +[browser_bug1008941_dismissGeolocationHanger.js] +[browser_bug1238427.js] +[browser_ConsoleAPI_originAttributes.js] +[browser_ConsoleAPITests.js] +skip-if = e10s +[browser_ConsoleStorageAPITests.js] +[browser_ConsoleStoragePBTest_perwindowpb.js] +[browser_focus_steal_from_chrome.js] +[browser_focus_steal_from_chrome_during_mousedown.js] +[browser_frame_elements.js] +[browser_largeAllocation.js] +skip-if = !e10s # Large-Allocation requires e10s +[browser_localStorage_privatestorageevent.js] +[browser_test__content.js] +[browser_test_new_window_from_content.js] +tags = openwindow +skip-if = toolkit == 'android' || (os == "linux" && debug) # see bug 1261495 for Linux debug time outs +support-files = + test_new_window_from_content_child.html +[browser_test_toolbars_visibility.js] +support-files = + test_new_window_from_content_child.html +[browser_xhr_sandbox.js] diff --git a/dom/tests/mochitest/ajax/jquery/mochitest.ini b/dom/tests/mochitest/ajax/jquery/mochitest.ini index 7f4fb67c4748..110b669aea33 100644 --- a/dom/tests/mochitest/ajax/jquery/mochitest.ini +++ b/dom/tests/mochitest/ajax/jquery/mochitest.ini @@ -34,4 +34,4 @@ support-files = test/unit/selector.js [test_jQuery.html] -skip-if = (toolkit == 'gonk' && debug) || toolkit == 'android' #bug 775227 #debug-only timeout +skip-if = toolkit == 'android' #bug 775227 diff --git a/dom/tests/mochitest/ajax/offline/mochitest.ini b/dom/tests/mochitest/ajax/offline/mochitest.ini index 5125653d943a..961b143b6b48 100644 --- a/dom/tests/mochitest/ajax/offline/mochitest.ini +++ b/dom/tests/mochitest/ajax/offline/mochitest.ini @@ -66,62 +66,36 @@ support-files = namespace2/script3.js [test_badManifestMagic.html] -skip-if = buildapp == 'b2g' # b2g(all related, needs fix in offlineTests.js which could help) b2g-debug(all related, needs fix in offlineTests.js which could help) b2g-desktop(all related, needs fix in offlineTests.js which could help) [test_bug445544.html] -skip-if = buildapp == 'b2g' [test_bug460353.html] -skip-if = buildapp == 'b2g' [test_bug474696.html] -skip-if = buildapp == 'b2g' [test_bug544462.html] -skip-if = buildapp == 'b2g' [test_bug744719-cancel.html] -skip-if = buildapp == 'b2g' [test_bug744719.html] -skip-if = buildapp == 'b2g' [test_bug765203.html] -skip-if = buildapp == 'b2g' [test_bypass.html] -skip-if = buildapp == 'b2g' [test_cancelOfflineCache.html] -skip-if = buildapp == 'b2g' [test_changingManifest.html] -skip-if = buildapp == 'b2g' [test_fallback.html] -skip-if = buildapp == 'b2g' [test_foreign.html] -skip-if = buildapp == 'b2g' [test_identicalManifest.html] -skip-if = buildapp == 'b2g' [test_lowDeviceStorage.html] -skip-if = buildapp == 'b2g' [test_lowDeviceStorageDuringUpdate.html] -skip-if = buildapp == 'b2g' [test_missingFile.html] -skip-if = buildapp == 'b2g' [test_missingManifest.html] -skip-if = buildapp == 'b2g' [test_noManifest.html] -skip-if = buildapp == 'b2g' [test_obsolete.html] -skip-if = buildapp == 'b2g' [test_offlineIFrame.html] -skip-if = buildapp == 'b2g' -# [test_offlineMode.html] -# disabled due to bug 656943 +[test_offlineMode.html] +skip-if = true # disabled due to bug 656943 [test_overlap.html] -skip-if = buildapp == 'b2g' [test_redirectManifest.html] -skip-if = buildapp == 'b2g' [test_redirectUpdateItem.html] -skip-if = buildapp == 'b2g' [test_refetchManifest.html] -skip-if = buildapp == 'b2g' [test_simpleManifest.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT +skip-if = toolkit == 'android' #TIMED_OUT [test_updateCheck.html] -skip-if = buildapp == 'b2g' [test_updatingManifest.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT +skip-if = toolkit == 'android' #TIMED_OUT [test_xhtmlManifest.xhtml] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT +skip-if = toolkit == 'android' #TIMED_OUT diff --git a/dom/tests/mochitest/ajax/prototype/mochitest.ini b/dom/tests/mochitest/ajax/prototype/mochitest.ini index e7d932bfc32d..6af573fad697 100644 --- a/dom/tests/mochitest/ajax/prototype/mochitest.ini +++ b/dom/tests/mochitest/ajax/prototype/mochitest.ini @@ -64,4 +64,4 @@ support-files = test/unit/tmp/unit_test.html [test_Prototype.html] -skip-if = (toolkit == 'gonk' && debug) || toolkit == 'android' #debug-only timeout +skip-if = toolkit == 'android' diff --git a/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini b/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini index 2bef57e2280c..d4250c64014d 100644 --- a/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini +++ b/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini @@ -31,4 +31,4 @@ support-files = test/unit/unit_test.html [test_Scriptaculous.html] -skip-if = (toolkit == 'gonk' && debug) || toolkit == 'android' #debug-only failure +skip-if = toolkit == 'android' diff --git a/dom/tests/mochitest/beacon/chrome.ini b/dom/tests/mochitest/beacon/chrome.ini index 09991a18d519..ff5afd5468cf 100644 --- a/dom/tests/mochitest/beacon/chrome.ini +++ b/dom/tests/mochitest/beacon/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' || os == 'android' +skip-if = os == 'android' [test_beaconCookies.html] support-files = beacon-set-cookie.sjs diff --git a/dom/tests/mochitest/beacon/mochitest.ini b/dom/tests/mochitest/beacon/mochitest.ini index 10ba029438c4..0093ceed7e63 100644 --- a/dom/tests/mochitest/beacon/mochitest.ini +++ b/dom/tests/mochitest/beacon/mochitest.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if = buildapp == 'b2g' support-files = beacon-frame.html beacon-handler.sjs beacon-preflight-handler.sjs diff --git a/dom/tests/mochitest/bugs/mochitest.ini b/dom/tests/mochitest/bugs/mochitest.ini index 973829916f37..e0c71f857318 100644 --- a/dom/tests/mochitest/bugs/mochitest.ini +++ b/dom/tests/mochitest/bugs/mochitest.ini @@ -43,62 +43,56 @@ support-files = [test_bug159849.html] [test_bug289714.html] [test_bug260264.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g) +skip-if = toolkit == 'android' [test_bug260264_nested.html] -skip-if = buildapp == 'b2g' # b2g(dom.disable_open_during_load not implemented in b2g) b2g-debug(dom.disable_open_during_load not implemented in b2g) b2g-desktop(dom.disable_open_during_load not implemented in b2g) [test_bug265203.html] [test_bug291377.html] [test_bug291653.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) +skip-if = toolkit == 'android' #TIMED_OUT [test_bug304459.html] [test_bug308856.html] [test_bug327891.html] [test_bug333983.html] [test_bug335976.xhtml] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_bug342448.html] [test_bug345521.html] [test_bug346659.html] [test_bug351601.html] [test_bug369306.html] -skip-if = buildapp == 'mulet' || (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' #TIMED_OUT # b2g-debug(test timed out, can't focus back from popup window to opener?) b2g-desktop(test timed out, can't focus back from popup window to opener?) +skip-if = toolkit == 'android' #TIMED_OUT [test_bug370098.html] [test_bug377539.html] [test_bug384122.html] [test_bug389366.html] [test_bug38959.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug393974.html] [test_bug394769.html] [test_bug396843.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_bug400204.html] [test_bug404748.html] [test_bug406375.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' +skip-if = toolkit == 'android' [test_bug414291.html] tags = openwindow [test_bug427744.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' +skip-if = toolkit == 'android' [test_bug42976.html] [test_bug430276.html] [test_bug437361.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(dom.disable_open_during_load not implemented in b2g, showmodaldialog) b2g-debug(dom.disable_open_during_load not implemented in b2g, showmodaldialog) b2g-desktop(dom.disable_open_during_load not implemented in b2g, showmodaldialog) +skip-if = toolkit == 'android' [test_bug440572.html] [test_bug456151.html] [test_bug458091.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug459848.html] [test_bug465263.html] [test_bug479143.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) +skip-if = toolkit == 'android' [test_bug484775.html] [test_bug492925.html] [test_bug49312.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug495219.html] [test_bug504862.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #RANDOM # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) +skip-if = toolkit == 'android' #RANDOM [test_bug529328.html] [test_bug531176.html] [test_bug531542.html] @@ -108,29 +102,25 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #RAND [test_bug548828.html] [test_bug558973.html] [test_bug562433.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug563487.html] [test_bug581072.html] [test_bug583225.html] [test_bug585240.html] [test_bug585819.html] [test_bug593174.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug597809.html] skip-if = toolkit == 'android' [test_bug61098.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) +skip-if = toolkit == 'android' [test_bug612267.html] [test_bug617296.html] [test_bug620947.html] [test_bug622361.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug633133.html] [test_bug641552.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' +skip-if = toolkit == 'android' [test_bug642026.html] [test_bug648465.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug654137.html] [test_bug664737.html] [test_bug665548.html] @@ -162,12 +152,12 @@ skip-if = toolkit == 'android' #bug 775227 [test_onerror_message.html] [test_protochains.html] [test_resize_move_windows.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || os == 'linux' #Windows can't change size and position on Android # b2g(Windows can't change size and position on B2G) b2g-debug(Windows can't change size and position on B2G) b2g-desktop(Windows can't change size and position on B2G) +skip-if = toolkit == 'android' || os == 'linux' #Windows can't change size and position on Android [test_sizetocontent_clamp.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #Windows can't change size on Android # b2g(Windows can't change size on B2G) b2g-debug(Windows can't change size on B2G) b2g-desktop(Windows can't change size on B2G) +skip-if = toolkit == 'android' #Windows can't change size on Android [test_toJSON.html] [test_window_bar.html] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' +skip-if = toolkit == 'android' [test_bug1022869.html] [test_bug1112040.html] [test_bug1160342_marquee.html] diff --git a/dom/tests/mochitest/chrome/chrome.ini b/dom/tests/mochitest/chrome/chrome.ini index 173e5d158587..471cfc981f65 100644 --- a/dom/tests/mochitest/chrome/chrome.ini +++ b/dom/tests/mochitest/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' || os == 'android' +skip-if = os == 'android' support-files = 489127.html DOMWindowCreated_chrome.xul @@ -54,7 +54,6 @@ skip-if = os != 'mac' || os_version == '10.6' [test_cyclecollector.xul] [test_docshell_swap.xul] [test_focus.xul] -skip-if = buildapp == 'mulet' [test_focus_docnav.xul] [test_focus_switchbinding.xul] [test_focused_link_scroll.xul] diff --git a/dom/tests/mochitest/dom-level0/mochitest.ini b/dom/tests/mochitest/dom-level0/mochitest.ini index 4f210f09f2ac..595fcd281e38 100644 --- a/dom/tests/mochitest/dom-level0/mochitest.ini +++ b/dom/tests/mochitest/dom-level0/mochitest.ini @@ -9,7 +9,7 @@ support-files = [test_crossdomainprops.html] [test_innerWidthHeight_script.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' # Bug 1075071 - Permafail on Android/B2G/Mulet +skip-if = toolkit == 'android' # Bug 1075071 - Permafail on Android [test_location.html] [test_location_framed.html] [test_location_getters.html] diff --git a/dom/tests/mochitest/fetch/mochitest.ini b/dom/tests/mochitest/fetch/mochitest.ini index 0cf2dbbebe35..4047bac298b9 100644 --- a/dom/tests/mochitest/fetch/mochitest.ini +++ b/dom/tests/mochitest/fetch/mochitest.ini @@ -34,32 +34,24 @@ support-files = [test_headers.html] [test_headers_sw_reroute.html] -skip-if = buildapp == 'b2g' # Bug 1137683 [test_headers_mainthread.html] [test_fetch_basic.html] [test_fetch_basic_sw_reroute.html] -skip-if = buildapp == 'b2g' # Bug 1137683 [test_fetch_basic_sw_empty_reroute.html] -skip-if = buildapp == 'b2g' [test_fetch_basic_http.html] [test_fetch_basic_http_sw_reroute.html] -skip-if = buildapp == 'b2g' # Bug 1137683 [test_fetch_basic_http_sw_empty_reroute.html] -skip-if = buildapp == 'b2g' [test_fetch_cors.html] -skip-if = buildapp == 'b2g' || (toolkit == 'android' && debug) # Bug 1210552 && 1210282 +skip-if = toolkit == 'android' && debug # Bug 1210282 [test_fetch_cors_sw_reroute.html] -skip-if = buildapp == 'b2g' || (toolkit == 'android' && debug) # Bug 1137683 && 1210282 +skip-if = toolkit == 'android' && debug # Bug 1210282 [test_fetch_cors_sw_empty_reroute.html] -skip-if = buildapp == 'b2g' || (toolkit == 'android' && debug) # Bug 1210282 +skip-if = toolkit == 'android' && debug # Bug 1210282 [test_formdataparsing.html] [test_formdataparsing_sw_reroute.html] -skip-if = buildapp == 'b2g' # Bug 1137683 [test_request.html] [test_request_context.html] [test_request_sw_reroute.html] -skip-if = buildapp == 'b2g' # Bug 1137683 [test_response.html] [test_response_sw_reroute.html] -skip-if = buildapp == 'b2g' # Bug 1137683 [test_temporaryFileBlob.html] diff --git a/dom/tests/mochitest/gamepad/mochitest.ini b/dom/tests/mochitest/gamepad/mochitest.ini index 45fb3caf736e..add02cb59a08 100644 --- a/dom/tests/mochitest/gamepad/mochitest.ini +++ b/dom/tests/mochitest/gamepad/mochitest.ini @@ -1,5 +1,4 @@ [DEFAULT] -skip-if=(buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage support-files = gamepad_frame.html gamepad_frame_state.html diff --git a/dom/tests/mochitest/general/chrome.ini b/dom/tests/mochitest/general/chrome.ini index e3622b5435f5..b46b49c8cac9 100644 --- a/dom/tests/mochitest/general/chrome.ini +++ b/dom/tests/mochitest/general/chrome.ini @@ -1,11 +1,9 @@ [DEFAULT] -skip-if = buildapp == 'b2g' || os == 'android' +skip-if = os == 'android' +[test_idleapi_permissions.html] [test_innerScreen.xul] [test_offsets.css] [test_offsets.js] [test_offsets.xul] -skip-if = buildapp == 'mulet' -[test_idleapi_permissions.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' [test_spacetopagedown.html] diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini index 038eb8b589c7..bb4e79b769ef 100644 --- a/dom/tests/mochitest/general/mochitest.ini +++ b/dom/tests/mochitest/general/mochitest.ini @@ -56,68 +56,13 @@ support-files = !/dom/base/test/file_empty.html [test_497898.html] -skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage +skip-if = toolkit == 'android' [test_bug504220.html] [test_bug628069_1.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug628069_2.html] [test_bug631440.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage [test_bug653364.html] [test_bug861217.html] -[test_clientRects.html] -[test_clipboard_disallowed.html] -[test_clipboard_events.html] -subsuite = clipboard -skip-if = buildapp == 'b2g' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined) -[test_consoleAPI.html] -[test_contentViewer_overrideDPPX.html] -[test_DOMMatrix.html] -[test_domWindowUtils.html] -[test_domWindowUtils_scrollXY.html] -[test_domWindowUtils_scrollbarSize.html] -[test_donottrack.html] -skip-if = buildapp == 'mulet' -[test_focus_legend_noparent.html] -[test_focusrings.xul] -skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT -[test_for_of.html] -[test_frameElementWrapping.html] -[test_pointerPreserves3D.html] -[test_pointerPreserves3DClip.html] -[test_framedhistoryframes.html] -[test_img_mutations.html] -[test_interfaces.html] -skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage -# [test_network_events.html] -# Disable this test until bug 795711 is fixed. -[test_offsets.html] -support-files = test_offsets.js -[test_outerHTML.html] -[test_outerHTML.xhtml] -skip-if = buildapp == 'mulet' -[test_paste_selection.html] -skip-if = buildapp == 'mulet' -[test_performance_timeline.html] -[test_picture_mutations.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' -[test_resource_timing.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' -[test_resource_timing_cross_origin.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' -[test_performance_now.html] -[test_showModalDialog.html] -skip-if = e10s || buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #Don't run modal tests on Android # b2g(showmodaldialog) b2g-debug(showmodaldialog) b2g-desktop(showmodaldialog) -[test_showModalDialog_e10s.html] -run-if = e10s -[test_stylesheetPI.html] -[test_vibrator.html] -[test_windowProperties.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage -[test_windowedhistoryframes.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage -[test_navigation_timing.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' [test_bug1012662_editor.html] skip-if = (toolkit == 'android') # Disabled on Android, see bug 1230231 subsuite = clipboard @@ -127,18 +72,56 @@ skip-if = (toolkit == 'android') # Disabled on Android, see bug 1230231 [test_bug1161721.html] [test_bug1170911.html] subsuite = clipboard -[test_storagePermissionsAccept.html] -skip-if = buildapp == 'b2g' # Bug 1184427 - no SSL certs on b2g -[test_storagePermissionsRejectForeign.html] -skip-if = buildapp == 'b2g' # Bug 1184427 - no SSL certs on b2g -[test_storagePermissionsReject.html] -skip-if = buildapp == 'b2g' # Bug 1184427 - no SSL certs on b2g -[test_storagePermissionsLimitForeign.html] -skip-if = buildapp == 'b2g' # Bug 1184427 - no SSL certs on b2g -[test_selectevents.html] -skip-if = buildapp == 'b2g' || buildapp == 'mulet' || toolkit == 'android' # Mouse doesn't select in the same way -# Disabled on Android, see bug 1230232 -[test_WebKitCSSMatrix.html] -[test_resource_timing_frameset.html] [test_bug1208217.html] +[test_clientRects.html] +[test_clipboard_disallowed.html] +[test_clipboard_events.html] +subsuite = clipboard +[test_consoleAPI.html] +[test_contentViewer_overrideDPPX.html] +[test_DOMMatrix.html] +[test_domWindowUtils.html] +[test_domWindowUtils_scrollbarSize.html] +[test_domWindowUtils_scrollXY.html] +[test_donottrack.html] +[test_focus_legend_noparent.html] +[test_focusrings.xul] +skip-if = toolkit == 'android' #TIMED_OUT +[test_for_of.html] +[test_framedhistoryframes.html] +[test_frameElementWrapping.html] +[test_img_mutations.html] +[test_interfaces.html] +[test_navigation_timing.html] +[test_network_events.html] +skip-if = true +# Disable this test until bug 795711 is fixed. +[test_offsets.html] +support-files = test_offsets.js +[test_outerHTML.html] +[test_outerHTML.xhtml] +[test_paste_selection.html] +[test_performance_now.html] +[test_performance_timeline.html] [test_picture_apng.html] +[test_picture_mutations.html] +[test_pointerPreserves3D.html] +[test_pointerPreserves3DClip.html] +[test_resource_timing.html] +[test_resource_timing_cross_origin.html] +[test_resource_timing_frameset.html] +[test_selectevents.html] +skip-if = toolkit == 'android' # bug 1230232 - Mouse doesn't select in the same way +[test_showModalDialog.html] +skip-if = e10s || toolkit == 'android' #Don't run modal tests on Android +[test_showModalDialog_e10s.html] +run-if = e10s +[test_storagePermissionsAccept.html] +[test_storagePermissionsLimitForeign.html] +[test_storagePermissionsReject.html] +[test_storagePermissionsRejectForeign.html] +[test_stylesheetPI.html] +[test_vibrator.html] +[test_WebKitCSSMatrix.html] +[test_windowedhistoryframes.html] +[test_windowProperties.html] diff --git a/dom/tests/mochitest/localstorage/chrome.ini b/dom/tests/mochitest/localstorage/chrome.ini index 48e3bf4b9196..6cc5562c00c9 100644 --- a/dom/tests/mochitest/localstorage/chrome.ini +++ b/dom/tests/mochitest/localstorage/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' || os == 'android' +skip-if = os == 'android' support-files = page_blank.html frameQuota.html diff --git a/dom/tests/mochitest/localstorage/mochitest.ini b/dom/tests/mochitest/localstorage/mochitest.ini index 5547a64be5ea..5242bf9b18fb 100644 --- a/dom/tests/mochitest/localstorage/mochitest.ini +++ b/dom/tests/mochitest/localstorage/mochitest.ini @@ -21,37 +21,32 @@ support-files = [test_bug600307-DBOps.html] [test_bug746272-1.html] [test_bug746272-2.html] -skip-if = os == "android" || toolkit == 'gonk' # bug 962029 +skip-if = os == "android" # bug 962029 [test_cookieBlock.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) # b2g-debug(bug 913706) b2g-desktop(bug 913706) [test_cookieSession.html] -skip-if = toolkit=='gonk' # b2g(4 failures) b2g-debug(debug-only failure) [test_embededNulls.html] [test_keySync.html] [test_localStorageBase.html] -skip-if = buildapp == 'b2g' || e10s # b2g(no storage chrome event received) +skip-if = e10s [test_localStorageBaseSessionOnly.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_localStorageCookieSettings.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_localStorageEnablePref.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) [test_localStorageKeyOrder.html] [test_localStorageOriginsDiff.html] [test_localStorageOriginsDomainDiffs.html] [test_localStorageOriginsEquals.html] -skip-if = (toolkit == 'gonk' && debug) || toolkit == 'android' #debug-only timeout +skip-if = toolkit == 'android' [test_localStorageOriginsPortDiffs.html] [test_localStorageOriginsSchemaDiffs.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(needs https support) +skip-if = toolkit == 'android' #TIMED_OUT [test_localStorageQuota.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(needs https support) +skip-if = toolkit == 'android' #TIMED_OUT [test_localStorageQuotaSessionOnly.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(needs https support) +skip-if = toolkit == 'android' #TIMED_OUT [test_localStorageQuotaSessionOnly2.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(needs https support) +skip-if = toolkit == 'android' #TIMED_OUT [test_localStorageReplace.html] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || toolkit == 'android' +skip-if = toolkit == 'android' [test_lowDeviceStorage.html] [test_storageConstructor.html] [test_localStorageSessionPrefOverride.html] diff --git a/dom/tests/mochitest/orientation/mochitest.ini b/dom/tests/mochitest/orientation/mochitest.ini index 3a48e978b88c..16ffd62de38e 100644 --- a/dom/tests/mochitest/orientation/mochitest.ini +++ b/dom/tests/mochitest/orientation/mochitest.ini @@ -2,4 +2,3 @@ support-files = bug507902-frame.html [test_bug507902.html] -skip-if = (toolkit == 'gonk' && debug) #debug-only failure diff --git a/dom/tests/mochitest/pointerlock/mochitest.ini b/dom/tests/mochitest/pointerlock/mochitest.ini index 72754d0a73ed..106120dcb4c8 100644 --- a/dom/tests/mochitest/pointerlock/mochitest.ini +++ b/dom/tests/mochitest/pointerlock/mochitest.ini @@ -23,4 +23,4 @@ support-files = [test_pointerlock-api.html] tags = fullscreen -skip-if = buildapp == 'b2g' || toolkit == 'android' # B2G - window.open focus issues using fullscreen. +skip-if = toolkit == 'android' diff --git a/dom/tests/mochitest/sessionstorage/chrome.ini b/dom/tests/mochitest/sessionstorage/chrome.ini index fbba9af10854..65112f0f8241 100644 --- a/dom/tests/mochitest/sessionstorage/chrome.ini +++ b/dom/tests/mochitest/sessionstorage/chrome.ini @@ -1,4 +1,3 @@ [DEFAULT] -skip-if = buildapp == 'b2g' [test_sessionStorageFromChrome.xhtml] diff --git a/dom/tests/mochitest/sessionstorage/mochitest.ini b/dom/tests/mochitest/sessionstorage/mochitest.ini index 95ac06f774fe..126216c4fea1 100644 --- a/dom/tests/mochitest/sessionstorage/mochitest.ini +++ b/dom/tests/mochitest/sessionstorage/mochitest.ini @@ -9,14 +9,10 @@ support-files = interOriginTest.js [test_cookieSession.html] -skip-if = buildapp == 'b2g' # b2g(4 failures) [test_sessionStorageBase.html] -skip-if = buildapp == 'b2g' # b2g(no storage chrome event received) [test_sessionStorageBaseSessionOnly.html] -skip-if = buildapp == 'b2g' # b2g(bug 967737) [test_sessionStorageClone.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' # b2g(bug 968051) b2g-debug(bug 968051) b2g-desktop(Bug 931116, b2g desktop specific, initial triage) +skip-if = toolkit == 'android' [test_sessionStorageHttpHttps.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #TIMED_OUT # b2g(needs https to work) b2g-debug(needs https to work) b2g-desktop(needs https to work) +skip-if = toolkit == 'android' #TIMED_OUT [test_sessionStorageReplace.html] -skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage diff --git a/dom/tests/mochitest/storageevent/mochitest.ini b/dom/tests/mochitest/storageevent/mochitest.ini index 12f1e73a28a6..e16d9cd2e965 100644 --- a/dom/tests/mochitest/storageevent/mochitest.ini +++ b/dom/tests/mochitest/storageevent/mochitest.ini @@ -13,6 +13,5 @@ support-files = [test_storageLocalStorageEventCheckNoPropagation.html] [test_storageLocalStorageEventCheckPropagation.html] [test_storageNotifications.html] -skip-if = buildapp == 'mulet' [test_storageSessionStorageEventCheckNoPropagation.html] [test_storageSessionStorageEventCheckPropagation.html] diff --git a/dom/tests/mochitest/whatwg/chrome.ini b/dom/tests/mochitest/whatwg/chrome.ini index 34596488bfe2..6d6bfc36c6d4 100644 --- a/dom/tests/mochitest/whatwg/chrome.ini +++ b/dom/tests/mochitest/whatwg/chrome.ini @@ -1,4 +1,3 @@ [DEFAULT] -skip-if = buildapp == 'b2g' [test_postMessage_chrome.html] diff --git a/dom/tests/mochitest/whatwg/mochitest.ini b/dom/tests/mochitest/whatwg/mochitest.ini index 5c1ab2610399..ab853b86cf58 100644 --- a/dom/tests/mochitest/whatwg/mochitest.ini +++ b/dom/tests/mochitest/whatwg/mochitest.ini @@ -25,7 +25,7 @@ support-files = [test_MessageEvent.html] [test_postMessage_basehref.html] [test_postMessage_closed.html] -skip-if = buildapp == 'b2g' || toolkit == 'android' #bug 894914 - wrong data - got FAIL, expected message # b2g(bug 894914 - wrong data - got FAIL, expected message) b2g-debug(bug 894914 - wrong data - got FAIL, expected message) b2g-desktop(Bug 931116, b2g desktop specific, initial triage) +skip-if = toolkit == 'android' #bug 894914 - wrong data - got FAIL, expected message [test_postMessage_hash.html] [test_postMessage.html] [test_postMessage_idn.xhtml] diff --git a/dom/tests/reftest/reftest.list b/dom/tests/reftest/reftest.list index 60935ec9a98a..cce31a6f6588 100644 --- a/dom/tests/reftest/reftest.list +++ b/dom/tests/reftest/reftest.list @@ -3,11 +3,11 @@ == bug456008.xhtml bug456008-ref.html fuzzy-if(skiaContent,2,3) == bug439965.html bug439965-ref.html == bug427779.xml bug427779-ref.xml -skip-if(B2G||Mulet) fuzzy-if(skiaContent,1,5) == bug559996.html bug559996-ref.html # bug 773482 # Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) == bug591981-1.html bug591981-ref.html # Initial mulet triage: parity with B2G/B2G Desktop +fuzzy-if(skiaContent,1,5) == bug559996.html bug559996-ref.html +== bug591981-1.html bug591981-ref.html == bug591981-2.html bug591981-ref.html == bug592366-1.html bug592366-ref.html -skip-if(B2G||Mulet) == bug592366-2.html bug592366-ref.html # Initial mulet triage: parity with B2G/B2G Desktop -skip-if((B2G&&browserIsRemote)||Mulet) == bug592366-1.xhtml bug592366-ref.xhtml # Initial mulet triage: parity with B2G/B2G Desktop -skip-if(B2G||Mulet) == bug592366-2.xhtml bug592366-ref.xhtml # Initial mulet triage: parity with B2G/B2G Desktop +== bug592366-2.html bug592366-ref.html +== bug592366-1.xhtml bug592366-ref.xhtml +== bug592366-2.xhtml bug592366-ref.xhtml == bug798068.xhtml bug798068-ref.xhtml diff --git a/dom/tests/unit/xpcshell.ini b/dom/tests/unit/xpcshell.ini index 01fc324f69db..a7f192e877bd 100644 --- a/dom/tests/unit/xpcshell.ini +++ b/dom/tests/unit/xpcshell.ini @@ -1,7 +1,6 @@ [DEFAULT] head = tail = -skip-if = toolkit == 'gonk' [test_bug319968.js] [test_bug465752.js]