Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/tests. r=RyanVM
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:18 +0100
changeset 347863 648493535386acd8a87bfc48871225cd4f900a91
parent 347862 3d25e5ad545929c948353e965ac340703425fc68
child 347864 8ada21f8ae7b1fc7e60074b17faad7705b13c3ac
push id10298
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:33:03 +0000
treeherdermozilla-aurora@7e29173b1641 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersRyanVM
bugs1310297
milestone52.0a1
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/tests. r=RyanVM MozReview-Commit-ID: 83L2jqWhzZe
dom/tests/browser/browser.ini
dom/tests/mochitest/ajax/jquery/mochitest.ini
dom/tests/mochitest/ajax/offline/mochitest.ini
dom/tests/mochitest/ajax/prototype/mochitest.ini
dom/tests/mochitest/ajax/scriptaculous/mochitest.ini
dom/tests/mochitest/beacon/chrome.ini
dom/tests/mochitest/beacon/mochitest.ini
dom/tests/mochitest/bugs/mochitest.ini
dom/tests/mochitest/chrome/chrome.ini
dom/tests/mochitest/dom-level0/mochitest.ini
dom/tests/mochitest/fetch/mochitest.ini
dom/tests/mochitest/gamepad/mochitest.ini
dom/tests/mochitest/general/chrome.ini
dom/tests/mochitest/general/mochitest.ini
dom/tests/mochitest/localstorage/chrome.ini
dom/tests/mochitest/localstorage/mochitest.ini
dom/tests/mochitest/orientation/mochitest.ini
dom/tests/mochitest/pointerlock/mochitest.ini
dom/tests/mochitest/sessionstorage/chrome.ini
dom/tests/mochitest/sessionstorage/mochitest.ini
dom/tests/mochitest/storageevent/mochitest.ini
dom/tests/mochitest/whatwg/chrome.ini
dom/tests/mochitest/whatwg/mochitest.ini
dom/tests/reftest/reftest.list
dom/tests/unit/xpcshell.ini
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@@ -7,41 +7,38 @@ support-files =
   test_bug1004814.html
   worker_bug1004814.js
   geo_leak_test.html
   dummy.html
   test_largeAllocation.html
   test_largeAllocation.html^headers^
   !/dom/tests/mochitest/geolocation/network_geolocation.sjs
 
+[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_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
--- a/dom/tests/mochitest/ajax/jquery/mochitest.ini
+++ b/dom/tests/mochitest/ajax/jquery/mochitest.ini
@@ -29,9 +29,9 @@ support-files =
   test/unit/core.js
   test/unit/dimensions.js
   test/unit/event.js
   test/unit/fx.js
   test/unit/offset.js
   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
--- a/dom/tests/mochitest/ajax/offline/mochitest.ini
+++ b/dom/tests/mochitest/ajax/offline/mochitest.ini
@@ -61,67 +61,41 @@ support-files =
   namespace1/script.js
   namespace1/redirectToDifferentOrigin.sjs
   namespace1/sub/opp.html
   namespace1/sub/script1.js
   namespace1/sub2/script2.js
   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
--- a/dom/tests/mochitest/ajax/prototype/mochitest.ini
+++ b/dom/tests/mochitest/ajax/prototype/mochitest.ini
@@ -59,9 +59,9 @@ support-files =
   test/unit/tmp/number_test.html
   test/unit/tmp/position_test.html
   test/unit/tmp/range_test.html
   test/unit/tmp/selector_test.html
   test/unit/tmp/string_test.html
   test/unit/tmp/unit_test.html
 
 [test_Prototype.html]
-skip-if = (toolkit == 'gonk' && debug) || toolkit == 'android' #debug-only timeout
+skip-if = toolkit == 'android'
--- a/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini
+++ b/dom/tests/mochitest/ajax/scriptaculous/mochitest.ini
@@ -26,9 +26,9 @@ support-files =
   test/unit/loading_test.html
   test/unit/position_clone_test.html
   test/unit/slider_test.html
   test/unit/sortable_test.html
   test/unit/string_test.html
   test/unit/unit_test.html
 
 [test_Scriptaculous.html]
-skip-if = (toolkit == 'gonk' && debug) || toolkit == 'android' #debug-only failure
+skip-if = toolkit == 'android'
--- a/dom/tests/mochitest/beacon/chrome.ini
+++ b/dom/tests/mochitest/beacon/chrome.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 
 [test_beaconCookies.html]
 support-files = beacon-set-cookie.sjs
                 file_beaconCookies.html
--- a/dom/tests/mochitest/beacon/mochitest.ini
+++ b/dom/tests/mochitest/beacon/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files = beacon-frame.html
                 beacon-handler.sjs
                 beacon-preflight-handler.sjs
                 beacon-originheader-handler.sjs
                 beacon-redirect-handler.sjs
 
 [test_beacon.html]
 [test_beaconFrame.html]
--- a/dom/tests/mochitest/bugs/mochitest.ini
+++ b/dom/tests/mochitest/bugs/mochitest.ini
@@ -38,104 +38,94 @@ support-files =
   file_redirector.sjs
   file_prime_cookie.html
 
 [test_DOMWindowCreated_chromeonly.html]
 [test_bug132255.html]
 [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]
 [test_bug534149.html]
 [test_bug541530.html]
 [test_bug545314.html]
 [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]
 [test_bug684544.html]
 [test_bug691707.html]
 [test_bug698061.html]
 [test_bug698551.html]
 [test_bug707749.html]
@@ -157,18 +147,18 @@ skip-if = (buildapp == 'b2g' && toolkit 
 [test_bug927901.html]
 [test_devicemotion_multiple_listeners.html]
 skip-if = toolkit == 'android' #bug 775227
 [test_domparser_after_blank.html]
 [test_errorReporting.html]
 [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]
 [test_bug1171215.html]
--- a/dom/tests/mochitest/chrome/chrome.ini
+++ b/dom/tests/mochitest/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   489127.html
   DOMWindowCreated_chrome.xul
   DOMWindowCreated_content.html
   MozDomFullscreen_chrome.xul
   child_focus_frame.html
   file_DOM_element_instanceof.xul
   file_MozDomFullscreen.html
@@ -49,17 +49,16 @@ skip-if = os != 'mac' || os_version == '
 tags = openwindow
 # synthesizeNativeOSXClick does not work on 10.6
 skip-if = os != 'mac' || os_version == '10.6'
 [test_callback_wrapping.xul]
 [test_clonewrapper.xul]
 [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]
 [test_fullscreen.xul]
 tags = fullscreen
 # disabled on linux for timeouts--bug-867745
 skip-if = os == 'linux'
 [test_geolocation.xul]
--- a/dom/tests/mochitest/dom-level0/mochitest.ini
+++ b/dom/tests/mochitest/dom-level0/mochitest.ini
@@ -4,16 +4,16 @@ support-files =
   file_crossdomainprops_inner.html
   file_location.html
   framed_location.html
   idn_child.html
   innerWidthHeight_script.html
 
 [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]
 [test_location_sandboxed.html]
 [test_location_setters.html]
 [test_setting_document.domain_idn.html]
 [test_setting_document.domain_to_shortened_ipaddr.html]
--- a/dom/tests/mochitest/fetch/mochitest.ini
+++ b/dom/tests/mochitest/fetch/mochitest.ini
@@ -29,37 +29,29 @@ support-files =
   !/dom/xhr/tests/file_XHR_pass3.txt^headers^
   !/dom/xhr/tests/responseIdentical.sjs
   !/dom/xhr/tests/temporaryFileBlob.sjs
   !/dom/html/test/form_submit_server.sjs
   !/dom/security/test/cors/file_CrossSiteXHR_server.sjs
 
 [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]
--- a/dom/tests/mochitest/gamepad/mochitest.ini
+++ b/dom/tests/mochitest/gamepad/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if=(buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
 support-files =
   gamepad_frame.html
   gamepad_frame_state.html
   mock_gamepad.js
 
 [test_check_timestamp.html]
 [test_gamepad.html]
 [test_gamepad_connect_events.html]
--- 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]
--- a/dom/tests/mochitest/general/mochitest.ini
+++ b/dom/tests/mochitest/general/mochitest.ini
@@ -51,94 +51,77 @@ support-files =
   !/image/test/mochitest/blue.png
   !/image/test/mochitest/clear.png
   !/image/test/mochitest/damon.jpg
   !/image/test/mochitest/over.png
   !/image/test/mochitest/red.png
   !/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
 [test_bug1012662_noeditor.html]
 subsuite = clipboard
 skip-if = (toolkit == 'android') # Disabled on Android, see bug 1230231
 [test_bug1161721.html]
 [test_bug1170911.html]
 subsuite = clipboard
+[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]
-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_storagePermissionsReject.html]
+[test_storagePermissionsRejectForeign.html]
+[test_stylesheetPI.html]
+[test_vibrator.html]
 [test_WebKitCSSMatrix.html]
-[test_resource_timing_frameset.html]
-[test_bug1208217.html]
-[test_picture_apng.html]
+[test_windowedhistoryframes.html]
+[test_windowProperties.html]
--- a/dom/tests/mochitest/localstorage/chrome.ini
+++ b/dom/tests/mochitest/localstorage/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   page_blank.html
   frameQuota.html
   interOriginFrame.js
 
 [test_localStorageBasePrivateBrowsing_perwindowpb.html]
 skip-if = true # bug 1156725
 [test_localStorageFromChrome.xhtml]
--- a/dom/tests/mochitest/localstorage/mochitest.ini
+++ b/dom/tests/mochitest/localstorage/mochitest.ini
@@ -16,42 +16,37 @@ support-files =
   interOriginTest2.js
   localStorageCommon.js
   frameLocalStorageSessionOnly.html
 
 [test_brokenUTF-16.html]
 [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]
--- a/dom/tests/mochitest/orientation/mochitest.ini
+++ b/dom/tests/mochitest/orientation/mochitest.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 support-files = bug507902-frame.html
 
 [test_bug507902.html]
-skip-if = (toolkit == 'gonk' && debug) #debug-only failure
--- a/dom/tests/mochitest/pointerlock/mochitest.ini
+++ b/dom/tests/mochitest/pointerlock/mochitest.ini
@@ -18,9 +18,9 @@ support-files =
   file_suppressSomeMouseEvents.html
   file_locksvgelement.html
   file_allowPointerLockSandboxFlag.html
   file_changeLockElement.html
   iframe_differentDOM.html
 
 [test_pointerlock-api.html]
 tags = fullscreen
-skip-if = buildapp == 'b2g' || toolkit == 'android' # B2G - window.open focus issues using fullscreen.
+skip-if = toolkit == 'android'
--- 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]
--- a/dom/tests/mochitest/sessionstorage/mochitest.ini
+++ b/dom/tests/mochitest/sessionstorage/mochitest.ini
@@ -4,19 +4,15 @@ support-files =
   file_https.html
   frameEqual.html
   frameNotEqual.html
   frameReplace.html
   interOriginSlave.js
   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
--- a/dom/tests/mochitest/storageevent/mochitest.ini
+++ b/dom/tests/mochitest/storageevent/mochitest.ini
@@ -8,11 +8,10 @@ support-files =
   frameSessionStorageSlaveEqual.html
   frameSessionStorageSlaveNotEqual.html
   interOriginFrame.js
   interOriginTest2.js
 
 [test_storageLocalStorageEventCheckNoPropagation.html]
 [test_storageLocalStorageEventCheckPropagation.html]
 [test_storageNotifications.html]
-skip-if = buildapp == 'mulet'
 [test_storageSessionStorageEventCheckNoPropagation.html]
 [test_storageSessionStorageEventCheckPropagation.html]
--- 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]
--- a/dom/tests/mochitest/whatwg/mochitest.ini
+++ b/dom/tests/mochitest/whatwg/mochitest.ini
@@ -20,17 +20,17 @@ support-files =
   postMessage_userpass_helper.html
 
 [test_bug477323.html]
 [test_document_scripts.html]
 [test_MessageEvent_dispatchToOther.html]
 [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]
 [test_postMessage_jar.html]
 [test_postMessage_joined.html]
 [test_postMessage_onOther.html]
 [test_postMessage_origin.xhtml]
 [test_postMessage_override.html]
--- a/dom/tests/reftest/reftest.list
+++ b/dom/tests/reftest/reftest.list
@@ -1,13 +1,13 @@
 == bug453105.html bug453105-ref.html
 == optiontext.html optiontext-ref.html
 == 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
--- a/dom/tests/unit/xpcshell.ini
+++ b/dom/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'gonk'
 
 [test_bug319968.js]
 [test_bug465752.js]
 [test_Fetch.js]
 [test_geolocation_provider.js]
 # Bug 684962: test hangs consistently on Android
 skip-if = os == "android"
 [test_geolocation_timeout.js]