Bug 1310297 - Remove test annotations using b2g, mulet or gonk: toolkit. r=RyanVM
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:22 +0100
changeset 321198 f82afee9057c9d6af846bad731f543a0fb81d788
parent 321197 c92eb49b6d37cf32e44ff50476a612a0235e344e
child 321199 fc19521feaa58483ede2013d6323c7f9a80fa2e4
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: toolkit. r=RyanVM MozReview-Commit-ID: I5LuDjnM7By
toolkit/components/aboutmemory/tests/chrome.ini
toolkit/components/alerts/test/mochitest.ini
toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini
toolkit/components/autocomplete/tests/unit/xpcshell.ini
toolkit/components/commandlines/test/unit/xpcshell.ini
toolkit/components/commandlines/test/unit_unix/xpcshell.ini
toolkit/components/contentprefs/tests/mochitest/mochitest.ini
toolkit/components/contentprefs/tests/unit/xpcshell.ini
toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini
toolkit/components/crashes/tests/xpcshell/xpcshell.ini
toolkit/components/crashmonitor/test/unit/xpcshell.ini
toolkit/components/ctypes/tests/chrome/chrome.ini
toolkit/components/ctypes/tests/unit/xpcshell.ini
toolkit/components/downloads/test/unit/xpcshell.ini
toolkit/components/extensions/test/mochitest/mochitest.ini
toolkit/components/feeds/test/chrome.ini
toolkit/components/feeds/test/xpcshell.ini
toolkit/components/filepicker/test/unit/xpcshell.ini
toolkit/components/formautofill/test/chrome/chrome.ini
toolkit/components/formautofill/test/xpcshell/xpcshell.ini
toolkit/components/jsdownloads/test/unit/xpcshell.ini
toolkit/components/lz4/tests/xpcshell/xpcshell.ini
toolkit/components/mediasniffer/test/unit/xpcshell.ini
toolkit/components/osfile/tests/mochi/chrome.ini
toolkit/components/osfile/tests/xpcshell/xpcshell.ini
toolkit/components/passwordmgr/test/chrome/chrome.ini
toolkit/components/passwordmgr/test/mochitest.ini
toolkit/components/passwordmgr/test/mochitest/mochitest.ini
toolkit/components/passwordmgr/test/unit/xpcshell.ini
toolkit/components/perf/chrome.ini
toolkit/components/places/tests/bookmarks/xpcshell.ini
toolkit/components/places/tests/browser/browser.ini
toolkit/components/places/tests/chrome/chrome.ini
toolkit/components/places/tests/expiration/xpcshell.ini
toolkit/components/places/tests/favicons/xpcshell.ini
toolkit/components/places/tests/network/xpcshell.ini
toolkit/components/places/tests/queries/xpcshell.ini
toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
toolkit/components/places/tests/unit/xpcshell.ini
toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini
toolkit/components/prompts/test/mochitest.ini
toolkit/components/satchel/test/mochitest.ini
toolkit/components/satchel/test/unit/xpcshell.ini
toolkit/components/search/tests/xpcshell/xpcshell.ini
toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
toolkit/components/startup/tests/unit/xpcshell.ini
toolkit/components/telemetry/tests/unit/xpcshell.ini
toolkit/components/terminator/tests/xpcshell/xpcshell.ini
toolkit/components/thumbnails/test/browser.ini
toolkit/components/thumbnails/test/xpcshell.ini
toolkit/components/url-classifier/tests/mochitest/chrome.ini
toolkit/components/url-classifier/tests/mochitest/mochitest.ini
toolkit/components/url-classifier/tests/unit/xpcshell.ini
toolkit/components/urlformatter/tests/unit/xpcshell.ini
toolkit/components/viewsource/test/chrome.ini
toolkit/components/workerloader/tests/chrome.ini
toolkit/components/xulstore/tests/chrome/chrome.ini
toolkit/components/xulstore/tests/xpcshell/xpcshell.ini
toolkit/content/tests/browser/browser.ini
toolkit/content/tests/chrome/chrome.ini
toolkit/content/tests/reftests/reftest.list
toolkit/content/tests/unit/xpcshell.ini
toolkit/content/tests/widgets/chrome.ini
toolkit/content/tests/widgets/mochitest.ini
toolkit/crashreporter/test/unit/xpcshell.ini
toolkit/crashreporter/test/unit_ipc/xpcshell.ini
toolkit/forgetaboutsite/test/browser/browser.ini
toolkit/forgetaboutsite/test/unit/xpcshell.ini
toolkit/modules/tests/chrome/chrome.ini
toolkit/modules/tests/mochitest/mochitest.ini
toolkit/modules/tests/xpcshell/xpcshell.ini
toolkit/mozapps/downloads/tests/chrome/chrome.ini
toolkit/mozapps/extensions/test/browser/browser.ini
toolkit/mozapps/extensions/test/mochitest/mochitest.ini
toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
toolkit/mozapps/extensions/test/xpinstall/browser.ini
toolkit/mozapps/update/tests/chrome/chrome.ini
toolkit/mozapps/update/tests/unit_aus_update/downloadFileTooBig_gonk.js
toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
toolkit/profile/test/chrome.ini
toolkit/themes/osx/mochitests/chrome.ini
toolkit/xre/test/mochitest.ini
tools/profiler/tests/xpcshell.ini
--- a/toolkit/components/aboutmemory/tests/chrome.ini
+++ b/toolkit/components/aboutmemory/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet' || os == 'android')
+skip-if = os == 'android'
 support-files =
   crash-dump-diff1.json
   crash-dump-diff2.json
   crash-dump-good.json
   memory-reports-bad.json
   memory-reports-diff1.json
   memory-reports-diff2.json
   memory-reports-good.json
--- a/toolkit/components/alerts/test/mochitest.ini
+++ b/toolkit/components/alerts/test/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || buildapp == 'mulet'
 support-files =
   image.gif
   image.png
   image_server.sjs
 
 # Synchronous tests like test_alerts.html must come before
 # asynchronous tests like test_alerts_noobserve.html!
 [test_alerts.html]
--- a/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 head=head.js
 tail=
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_AsyncShutdown.js]
 [test_AsyncShutdown_leave_uncaught.js]
 [test_converters.js]
--- a/toolkit/components/autocomplete/tests/unit/xpcshell.ini
+++ b/toolkit/components/autocomplete/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 head = head_autocomplete.js
 tail = 
-skip-if = toolkit == 'gonk'
 
 [test_330578.js]
 [test_378079.js]
 [test_393191.js]
 [test_440866.js]
 [test_463023.js]
 [test_660156.js]
 [test_autocomplete_multiple.js]
--- a/toolkit/components/commandlines/test/unit/xpcshell.ini
+++ b/toolkit/components/commandlines/test/unit/xpcshell.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/test_bug410156.desktop
   data/test_bug410156.url
 
 [test_classinfo.js]
 [test_bug666224.js]
--- a/toolkit/components/commandlines/test/unit_unix/xpcshell.ini
+++ b/toolkit/components/commandlines/test/unit_unix/xpcshell.ini
@@ -1,9 +1,9 @@
 [DEFAULT]
 head = 
 tail = 
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   !/toolkit/components/commandlines/test/unit/data/test_bug410156.desktop
   !/toolkit/components/commandlines/test/unit/data/test_bug410156.url
 
 [test_bug410156.js]
--- a/toolkit/components/contentprefs/tests/mochitest/mochitest.ini
+++ b/toolkit/components/contentprefs/tests/mochitest/mochitest.ini
@@ -1,4 +1,4 @@
 [DEFAULT]
 
 [test_remoteContentPrefs.html]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' || e10s #bug 783513 # b2g(nested ipc not working) b2g-debug(nested ipc not working) b2g-desktop(nested ipc not working)
+skip-if = toolkit == 'android' || e10s # bug 783513
--- a/toolkit/components/contentprefs/tests/unit/xpcshell.ini
+++ b/toolkit/components/contentprefs/tests/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 head = head_contentPrefs.js
 tail = tail_contentPrefs.js
-skip-if = toolkit == 'gonk'
 
 [test_bug248970.js]
 [test_bug503971.js]
 [test_bug679784.js]
 [test_contentPrefs.js]
 [test_contentPrefsCache.js]
 [test_getPrefAsync.js]
 [test_stringGroups.js]
--- a/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini
+++ b/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files = AsyncRunner.jsm
 
 [test_service.js]
 [test_setGet.js]
 [test_getSubdomains.js]
 [test_remove.js]
 [test_removeByDomain.js]
 [test_removeAllDomains.js]
--- a/toolkit/components/crashes/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/crashes/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_crash_manager.js]
 [test_crash_service.js]
 [test_crash_store.js]
--- a/toolkit/components/crashmonitor/test/unit/xpcshell.ini
+++ b/toolkit/components/crashmonitor/test/unit/xpcshell.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 head = head.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_init.js]
 [test_valid_file.js]
 [test_invalid_file.js]
 [test_invalid_json.js]
 [test_missing_file.js]
 [test_register.js]
--- a/toolkit/components/ctypes/tests/chrome/chrome.ini
+++ b/toolkit/components/ctypes/tests/chrome/chrome.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   xpcshellTestHarnessAdaptor.js
   ctypes_worker.js
   ../unit/test_jsctypes.js
 
 [test_ctypes.xul]
--- a/toolkit/components/ctypes/tests/unit/xpcshell.ini
+++ b/toolkit/components/ctypes/tests/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_errno.js]
 
 [test_finalizer.js]
 [test_finalizer_shouldfail.js]
 [test_finalizer_shouldaccept.js]
 [test_jsctypes.js]
 # Bug 676989: test fails consistently on Android
--- a/toolkit/components/downloads/test/unit/xpcshell.ini
+++ b/toolkit/components/downloads/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_download_manager.js
 tail = tail_download_manager.js
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/digest.chunk
   data/block_digest.chunk
   data/signed_win.exe
 
 [test_app_rep.js]
 [test_app_rep_windows.js]
 skip-if = os != "win"
--- a/toolkit/components/extensions/test/mochitest/mochitest.ini
+++ b/toolkit/components/extensions/test/mochitest/mochitest.ini
@@ -76,17 +76,17 @@ skip-if = os == 'android' # port.sender.
 [test_ext_sendmessage_doublereply.html]
 skip-if = os == 'android' # port.sender.tab is undefined on Android (bug 1258975).
 [test_ext_sendmessage_no_receiver.html]
 [test_ext_storage_content.html]
 [test_ext_storage_tab.html]
 skip-if = os == 'android' # Android does not currently support tabs.
 [test_ext_test.html]
 [test_ext_cookies.html]
-skip-if = (os == 'android' || buildapp == 'b2g') # needs TabManager which is not yet implemented. Bug 1258975 on android.
+skip-if = os == 'android' # Bug 1258975 on android.
 [test_ext_background_api_injection.html]
 [test_ext_background_generated_url.html]
 [test_ext_background_teardown.html]
 [test_ext_tab_teardown.html]
 skip-if = (os == 'android') # Android does not support tabs API. Bug 1260250
 [test_ext_unload_frame.html]
 [test_ext_i18n.html]
 skip-if = (os == 'android') # Bug 1258975 on android.
--- a/toolkit/components/feeds/test/chrome.ini
+++ b/toolkit/components/feeds/test/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug675492.xul]
--- a/toolkit/components/feeds/test/xpcshell.ini
+++ b/toolkit/components/feeds/test/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
     xml/rfc4287/author_namespaces.xml
     xml/rfc4287/entry_link_IANA.xml
     xml/rfc4287/feed_author_email_2.xml
     xml/rfc4287/feed_logo.xml
     xml/rfc4287/entry_author.xml
     xml/rfc4287/entry_link_otherURI_alt.xml
     xml/rfc4287/feed_author_email.xml
--- a/toolkit/components/filepicker/test/unit/xpcshell.ini
+++ b/toolkit/components/filepicker/test/unit/xpcshell.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_filecomplete.js]
 skip-if = os != 'linux'
--- a/toolkit/components/formautofill/test/chrome/chrome.ini
+++ b/toolkit/components/formautofill/test/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 # The following files starting with ".." are installed in the current folder.
 support-files =
   ../head_common.js
   ../loader_common.js
   head.js
   test_infrastructure.js
   test_requestAutocomplete_cancel.js
   loader_parent.js
--- a/toolkit/components/formautofill/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/formautofill/test/xpcshell/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = loader.js head.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 # The following files starting with ".." are installed in the current folder.
 # However, they cannot be referenced directly in the "head" directive above.
 support-files =
   ../head_common.js
   ../loader_common.js
 
 [test_infrastructure.js]
 [test_integration.js]
--- a/toolkit/components/jsdownloads/test/unit/xpcshell.ini
+++ b/toolkit/components/jsdownloads/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 # Note: The "tail.js" file is not defined in the "tail" key because it calls
 #       the "add_test_task" function, that does not work properly in tail files.
 support-files =
   common_test_Download.js
 
 [test_DownloadCore.js]
 [test_DownloadImport.js]
--- a/toolkit/components/lz4/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/lz4/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/worker_lz4.js
   data/chrome.manifest
   data/compression.lz
 
 [test_lz4.js]
 [test_lz4_sync.js]
--- a/toolkit/components/mediasniffer/test/unit/xpcshell.ini
+++ b/toolkit/components/mediasniffer/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/bug1079747.mp4
   data/detodos.mp3
   data/ff-inst.exe
   data/file.mkv
   data/file.webm
   data/fl10.mp2
   data/he_free.mp3
--- a/toolkit/components/osfile/tests/mochi/chrome.ini
+++ b/toolkit/components/osfile/tests/mochi/chrome.ini
@@ -1,16 +1,15 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   main_test_osfile_async.js
   worker_handler.js
   worker_test_osfile_comms.js
   worker_test_osfile_front.js
   worker_test_osfile_shared.js
   worker_test_osfile_unix.js
   worker_test_osfile_win.js
 
 [test_osfile_async.xul]
 [test_osfile_back.xul]
 [test_osfile_comms.xul]
-skip-if = buildapp == 'mulet'
 [test_osfile_front.xul]
--- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
@@ -1,56 +1,51 @@
 [DEFAULT]
 head = head.js
 tail =
-# Intermittently times out on debug b2g emulators
-requesttimeoutfactor = 2
 
 support-files =
   test_loader/module_test_loader.js
 
 [test_available_free_space.js]
-[test_osfile_closed.js]
-[test_path.js]
+[test_compression.js]
+[test_constants.js]
+[test_creationDate.js]
+[test_duration.js]
+[test_exception.js]
+[test_file_URL_conversion.js]
+[test_loader.js]
+[test_logging.js]
+[test_makeDir.js]
+[test_open.js]
 [test_osfile_async.js]
 [test_osfile_async_append.js]
 [test_osfile_async_bytes.js]
 [test_osfile_async_copy.js]
 [test_osfile_async_flush.js]
 [test_osfile_async_largefiles.js]
 [test_osfile_async_setDates.js]
-skip-if = (toolkit == 'gonk' && debug) # Bug 1208199
-[test_removeEmptyDir.js]
-[test_makeDir.js]
-[test_file_URL_conversion.js]
-[test_logging.js]
-[test_creationDate.js]
-[test_exception.js]
-[test_path_constants.js]
-[test_remove.js]
-[test_removeDir.js]
-requesttimeoutfactor = 4
-[test_reset.js]
-[test_shutdown.js]
-[test_unique.js]
-[test_open.js]
-[test_telemetry.js]
-[test_duration.js]
-[test_read_write.js]
-requesttimeoutfactor = 4
-[test_compression.js]
-[test_osfile_writeAtomic_backupTo_option.js]
-[test_osfile_writeAtomic_zerobytes.js]
-[test_osfile_error.js]
-[test_queue.js]
-[test_loader.js]
-[test_constants.js]
-[test_osfile_kill.js]
-
 # Unimplemented on Windows (bug 1022816).
 # Spurious failure on Android test farm due to non-POSIX behavior of
 # filesystem backing /mnt/sdcard (not worth trying to fix).
 [test_osfile_async_setPermissions.js]
 skip-if = os == "win" || os == "android"
-
+[test_osfile_closed.js]
+[test_osfile_error.js]
+[test_osfile_kill.js]
 # Windows test
 [test_osfile_win_async_setPermissions.js]
 skip-if = os != "win"
+[test_osfile_writeAtomic_backupTo_option.js]
+[test_osfile_writeAtomic_zerobytes.js]
+[test_path.js]
+[test_path_constants.js]
+[test_queue.js]
+[test_read_write.js]
+requesttimeoutfactor = 4
+[test_remove.js]
+[test_removeDir.js]
+requesttimeoutfactor = 4
+[test_removeEmptyDir.js]
+[test_reset.js]
+[test_shutdown.js]
+[test_telemetry.js]
+[test_unique.js]
--- a/toolkit/components/passwordmgr/test/chrome/chrome.ini
+++ b/toolkit/components/passwordmgr/test/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 
 [test_privbrowsing_perwindowpb.html]
 skip-if = true # Bug 1173337
 support-files =
   ../formsubmit.sjs
   notification_common.js
   privbrowsing_perwindowpb_iframe.html
   subtst_privbrowsing_1.html
--- a/toolkit/components/passwordmgr/test/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || e10s
+skip-if = e10s
 support-files =
   authenticate.sjs
   blank.html
   formsubmit.sjs
   prompt_common.js
   pwmgr_common.js
   subtst_master_pass.html
   subtst_prompt_async.html
--- a/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
+++ b/toolkit/components/passwordmgr/test/mochitest/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files =
   ../../../prompts/test/chromeScript.js
   ../../../prompts/test/prompt_common.js
   ../../../satchel/test/parent_utils.js
   ../../../satchel/test/satchel_common.js
   ../authenticate.sjs
   ../blank.html
   ../browser/form_basic.html
--- a/toolkit/components/passwordmgr/test/unit/xpcshell.ini
+++ b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
@@ -1,12 +1,11 @@
 [DEFAULT]
 head = head.js
 tail =
-skip-if = toolkit == 'gonk'
 support-files = data/**
 
 # Test JSON file access and import from SQLite, not applicable to Android.
 [test_module_LoginImport.js]
 skip-if = os == "android"
 [test_module_LoginStore.js]
 skip-if = os == "android"
 [test_removeLegacySignonFiles.js]
--- a/toolkit/components/perf/chrome.ini
+++ b/toolkit/components/perf/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_pm.xul]
--- a/toolkit/components/places/tests/bookmarks/xpcshell.ini
+++ b/toolkit/components/places/tests/bookmarks/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_1016953-renaming-uncompressed.js]
 [test_1017502-bookmarks_foreign_count.js]
 [test_384228.js]
 [test_385829.js]
 [test_388695.js]
 [test_393498.js]
 [test_395101.js]
--- a/toolkit/components/places/tests/browser/browser.ini
+++ b/toolkit/components/places/tests/browser/browser.ini
@@ -6,17 +6,16 @@ support-files =
   colorAnalyzer/localeGeneric.png
   head.js
 
 [browser_bug248970.js]
 [browser_bug399606.js]
 [browser_bug461710.js]
 [browser_bug646422.js]
 [browser_bug680727.js]
-skip-if = buildapp == 'mulet' # Bug ?????? - test times out on try on all platforms, but works locally for markh!
 [browser_colorAnalyzer.js]
 [browser_double_redirect.js]
 [browser_favicon_privatebrowsing_perwindowpb.js]
 [browser_favicon_setAndFetchFaviconForPage.js]
 [browser_favicon_setAndFetchFaviconForPage_failures.js]
 [browser_history_post.js]
 [browser_notfound.js]
 [browser_redirect.js]
--- a/toolkit/components/places/tests/chrome/chrome.ini
+++ b/toolkit/components/places/tests/chrome/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_303567.xul]
 [test_341972a.xul]
 [test_341972b.xul]
 [test_342484.xul]
 [test_371798.xul]
 [test_381357.xul]
 [test_favicon_annotations.xul]
--- a/toolkit/components/places/tests/expiration/xpcshell.ini
+++ b/toolkit/components/places/tests/expiration/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_expiration.js
 tail = 
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_analyze_runs.js]
 # Bug 676989: test hangs consistently on Android
 skip-if = os == "android"
 [test_annos_expire_history.js]
 [test_annos_expire_never.js]
 [test_annos_expire_policy.js]
 [test_annos_expire_session.js]
--- a/toolkit/components/places/tests/favicons/xpcshell.ini
+++ b/toolkit/components/places/tests/favicons/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_favicons.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   expected-favicon-big32.jpg.png
   expected-favicon-big4.jpg.png
   expected-favicon-big48.ico.png
   expected-favicon-big64.png.png
   expected-favicon-scale160x3.jpg.png
   expected-favicon-scale3x160.jpg.png
   favicon-big16.ico
--- a/toolkit/components/places/tests/network/xpcshell.ini
+++ b/toolkit/components/places/tests/network/xpcshell.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_network.js
 tail = 
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_history_redirects.js]
--- a/toolkit/components/places/tests/queries/xpcshell.ini
+++ b/toolkit/components/places/tests/queries/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_queries.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_415716.js]
 [test_abstime-annotation-domain.js]
 [test_abstime-annotation-uri.js]
 [test_async.js]
 [test_containersQueries_sorting.js]
 [test_history_queries_tags_liveUpdate.js]
 [test_history_queries_titles_liveUpdate.js]
--- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_autocomplete.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/engine-rel-searchform.xml
   data/engine-suggestions.xml
   !/toolkit/components/places/tests/favicons/favicon-normal16.png
 
 [test_416211.js]
 [test_416214.js]
 [test_417798.js]
--- a/toolkit/components/places/tests/unit/xpcshell.ini
+++ b/toolkit/components/places/tests/unit/xpcshell.ini
@@ -1,13 +1,13 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   bookmarks.corrupt.html
   bookmarks.json
   bookmarks.preplaces.html
   bookmarks_html_singleframe.html
   bug476292.sqlite
   default.sqlite
   livemark.xml
--- a/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,9 @@
 [DEFAULT]
 head=
 tail=
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files=
   data/worker.js
   data/chrome.manifest
 
 [test_Promise.js]
--- a/toolkit/components/prompts/test/mochitest.ini
+++ b/toolkit/components/prompts/test/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files =
   ../../passwordmgr/test/authenticate.sjs
   bug619644_inner.html
   bug625187_iframe.html
   prompt_common.js
   chromeScript.js
 
 [test_bug619644.html]
--- a/toolkit/components/satchel/test/mochitest.ini
+++ b/toolkit/components/satchel/test/mochitest.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = toolkit == 'android' || buildapp == 'b2g' || os == 'linux' # linux - bug 1022386
+skip-if = toolkit == 'android' || os == 'linux' # linux - bug 1022386
 support-files =
   satchel_common.js
   subtst_form_submission_1.html
   subtst_privbrowsing.html
   parent_utils.js
 
 [test_bug_511615.html]
 [test_bug_787624.html]
--- a/toolkit/components/satchel/test/unit/xpcshell.ini
+++ b/toolkit/components/satchel/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_satchel.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   asyncformhistory_expire.sqlite
   formhistory_1000.sqlite
   formhistory_CORRUPT.sqlite
   formhistory_apitest.sqlite
   formhistory_autocomplete.sqlite
   formhistory_v3.sqlite
   formhistory_v3v4.sqlite
--- a/toolkit/components/search/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini
@@ -1,13 +1,13 @@
 [DEFAULT]
 head = head_search.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/chrome.manifest
   data/engine.xml
   data/engine2.xml
   data/engine-addon.xml
   data/engine-override.xml
   data/engine-app.xml
   data/engine-fr.xml
--- a/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk' || (os == 'mac' && appname == 'thunderbird')
+skip-if = toolkit == 'android' || (os == 'mac' && appname == 'thunderbird')
 support-files =
   data/worker_sqlite_shared.js
   data/worker_sqlite_internal.js
   data/chrome.manifest
 
 [test_sqlite_internal.js]
--- a/toolkit/components/startup/tests/unit/xpcshell.ini
+++ b/toolkit/components/startup/tests/unit/xpcshell.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_startup.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_startup_crash.js]
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -1,13 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'gonk'
 # The *.xpi files are only needed for test_TelemetryEnvironment.js, but
 # xpcshell fails to install tests if we move them under the test entry.
 support-files =
   ../search/chrome.manifest
   ../search/searchTest.jar
   dictionary.xpi
   experiment.xpi
   extension.xpi
--- a/toolkit/components/terminator/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/terminator/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 head=
 tail=
 
 [test_terminator_record.js]
 skip-if = debug # Disabled by bug 1242084, bug 1255484 will enable it again.
 [test_terminator_reload.js]
-skip-if = (os == "android" || appname == "b2g")
+skip-if = os == "android"
--- a/toolkit/components/thumbnails/test/browser.ini
+++ b/toolkit/components/thumbnails/test/browser.ini
@@ -7,34 +7,32 @@ support-files =
   head.js
   privacy_cache_control.sjs
   thumbnails_background.sjs
   thumbnails_crash_content_helper.js
   thumbnails_update.sjs
 
 [browser_thumbnails_bg_bad_url.js]
 [browser_thumbnails_bg_crash_during_capture.js]
-skip-if = buildapp == 'mulet' || !crashreporter
+skip-if = !crashreporter
 [browser_thumbnails_bg_crash_while_idle.js]
-skip-if = buildapp == 'mulet' || !crashreporter
+skip-if = !crashreporter
 [browser_thumbnails_bg_basic.js]
 [browser_thumbnails_bg_queueing.js]
 [browser_thumbnails_bg_timeout.js]
 [browser_thumbnails_bg_redirect.js]
 [browser_thumbnails_bg_destroy_browser.js]
 [browser_thumbnails_bg_no_cookies_sent.js]
 [browser_thumbnails_bg_no_cookies_stored.js]
 [browser_thumbnails_bg_no_auth_prompt.js]
 [browser_thumbnails_bg_no_alert.js]
 [browser_thumbnails_bg_no_duplicates.js]
 [browser_thumbnails_bg_captureIfMissing.js]
 [browser_thumbnails_bug726727.js]
-skip-if = buildapp == 'mulet'
 [browser_thumbnails_bug727765.js]
 [browser_thumbnails_bug818225.js]
 [browser_thumbnails_capture.js]
 [browser_thumbnails_expiration.js]
 [browser_thumbnails_privacy.js]
 [browser_thumbnails_redirect.js]
 [browser_thumbnails_storage.js]
 [browser_thumbnails_storage_migrate3.js]
-skip-if = buildapp == 'mulet'
 [browser_thumbnails_update.js]
--- a/toolkit/components/thumbnails/test/xpcshell.ini
+++ b/toolkit/components/thumbnails/test/xpcshell.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 head =
 tail =
 
 [test_thumbnails_interfaces.js]
-skip-if = os == 'b2g' || os == 'android' # xpcom interface not packaged
+skip-if = os == 'android' # xpcom interface not packaged
--- a/toolkit/components/url-classifier/tests/mochitest/chrome.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   allowlistAnnotatedFrame.html
   classifiedAnnotatedFrame.html
   classifiedAnnotatedPBFrame.html
   bug_1281083.html
 
 [test_lookup_system_principal.html]
 [test_classified_annotations.html]
--- a/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   classifiedAnnotatedPBFrame.html
   classifierCommon.js
   classifierFrame.html
   classifierHelper.js
   cleanWorker.js
   good.js
   evil.css
--- a/toolkit/components/url-classifier/tests/unit/xpcshell.ini
+++ b/toolkit/components/url-classifier/tests/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_urlclassifier.js
 tail = tail_urlclassifier.js
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   data/digest1.chunk
   data/digest2.chunk
 
 [test_addsub.js]
 [test_bug1274685_unowned_list.js]
 [test_backoff.js]
 [test_dbservice.js]
--- a/toolkit/components/urlformatter/tests/unit/xpcshell.ini
+++ b/toolkit/components/urlformatter/tests/unit/xpcshell.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 head = head_urlformatter.js
 tail = 
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_urlformatter.js]
--- a/toolkit/components/viewsource/test/chrome.ini
+++ b/toolkit/components/viewsource/test/chrome.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug428653.html]
 support-files = file_empty.html
--- a/toolkit/components/workerloader/tests/chrome.ini
+++ b/toolkit/components/workerloader/tests/chrome.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   moduleA-depends.js
   moduleB-dependency.js
   moduleC-circular.js
   moduleD-circular.js
   moduleE-throws-during-require.js
   moduleF-syntax-error.js
   moduleG-throws-later.js
--- a/toolkit/components/xulstore/tests/chrome/chrome.ini
+++ b/toolkit/components/xulstore/tests/chrome/chrome.ini
@@ -1,7 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   window_persistence.xul
   animals.rdf
 
 [test_persistence.xul]
--- a/toolkit/components/xulstore/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/xulstore/tests/xpcshell/xpcshell.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   localstore.rdf
 
 [test_XULStore.js]
--- a/toolkit/content/tests/browser/browser.ini
+++ b/toolkit/content/tests/browser/browser.ini
@@ -47,29 +47,25 @@ tags = audiochannel
 support-files =
   file_mediaPlayback.html
   file_mediaPlaybackFrame.html
 [browser_mediaPlayback_mute.js]
 tags = audiochannel
 support-files =
   file_mediaPlayback2.html
   file_mediaPlaybackFrame2.html
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [browser_mediaPlayback_suspended.js]
 tags = audiochannel
 support-files =
   file_mediaPlayback2.html
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [browser_mediaPlayback_suspended_multipleAudio.js]
 tags = audiochannel
 support-files =
   file_multipleAudio.html
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [browser_mute.js]
 tags = audiochannel
 [browser_mute2.js]
 tags = audiochannel
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 [browser_quickfind_editable.js]
 [browser_saveImageURL.js]
 support-files =
   image.jpg
   image_page.html
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   ../widgets/popup_shared.js
   ../widgets/tree_shared.js
   RegisterUnregisterChrome.js
   bug263683_window.xul
   bug304188_window.xul
   bug331215_window.xul
   bug360437_window.xul
@@ -58,17 +58,16 @@ support-files =
 [test_autocomplete5.xul]
 [test_autocomplete_delayOnPaste.xul]
 subsuite = clipboard
 [test_autocomplete_emphasis.xul]
 [test_autocomplete_with_composition_on_input.html]
 [test_autocomplete_with_composition_on_textbox.xul]
 [test_autocomplete_placehold_last_complete.xul]
 [test_browser_drop.xul]
-skip-if = buildapp == 'mulet'
 [test_bug253481.xul]
 subsuite = clipboard
 [test_bug263683.xul]
 [test_bug304188.xul]
 [test_bug331215.xul]
 [test_bug360220.xul]
 [test_bug360437.xul]
 skip-if = os == 'linux' # Bug 1264604
@@ -97,46 +96,40 @@ skip-if = toolkit == "cocoa"
 [test_closemenu_attribute.xul]
 [test_colorpicker_popup.xul]
 [test_contextmenu_list.xul]
 [test_datepicker.xul]
 [test_deck.xul]
 [test_dialogfocus.xul]
 [test_findbar.xul]
 subsuite = clipboard
-skip-if = buildapp == 'mulet'
 [test_findbar_entireword.xul]
-skip-if = buildapp == 'mulet'
 [test_findbar_events.xul]
 [test_focus_anons.xul]
 [test_hiddenitems.xul]
 [test_hiddenpaging.xul]
 [test_keys.xul]
 [test_labelcontrol.xul]
 [test_largemenu.xul]
 skip-if = os == 'linux' && !debug #Bug 1207174
 [test_menu.xul]
 [test_menu_anchored.xul]
 [test_menu_hide.xul]
 [test_menuchecks.xul]
 [test_menuitem_blink.xul]
 [test_menuitem_commands.xul]
 [test_menulist.xul]
-skip-if = buildapp == 'mulet'
 [test_menulist_keynav.xul]
 [test_menulist_null_value.xul]
 [test_menulist_paging.xul]
 [test_menulist_position.xul]
 [test_mousescroll.xul]
-skip-if = buildapp == 'mulet'
 [test_notificationbox.xul]
-skip-if = buildapp == 'mulet'
 [test_panel.xul]
 [test_panelfrommenu.xul]
-skip-if = buildapp == 'mulet'
 [test_popup_anchor.xul]
 [test_popup_anchoratrect.xul]
 skip-if = os == 'linux' # 1167694
 [test_popup_attribute.xul]
 skip-if = os == 'linux' && asan #Bug 1131634
 [test_popup_button.xul]
 skip-if = os == 'linux' && asan # Bug 1281360
 [test_popup_coords.xul]
@@ -159,20 +152,18 @@ support-files = window_preferences_befor
 support-files = window_preferences_onsyncfrompreference.xul
 [test_progressmeter.xul]
 [test_props.xul]
 [test_radio.xul]
 [test_richlist_direction.xul]
 [test_righttoleft.xul]
 [test_scale.xul]
 [test_scaledrag.xul]
-skip-if = buildapp == 'mulet'
 [test_screenPersistence.xul]
 [test_scrollbar.xul]
-skip-if = buildapp == 'mulet'
 [test_showcaret.xul]
 [test_sorttemplate.xul]
 [test_statusbar.xul]
 [test_subframe_origin.xul]
 [test_tabbox.xul]
 [test_tabindex.xul]
 [test_textbox_dictionary.xul]
 [test_textbox_emptytext.xul]
--- a/toolkit/content/tests/reftests/reftest.list
+++ b/toolkit/content/tests/reftests/reftest.list
@@ -1,2 +1,2 @@
-skip-if(B2G&&browserIsRemote) random-if(cocoaWidget) == bug-442419-progressmeter-max.xul bug-442419-progressmeter-max-ref.xul # fails most of the time on Mac because progress meter animates # Bug 974780
-skip-if(B2G&&browserIsRemote) != textbox-multiline-default-value.xul textbox-multiline-empty.xul # Bug 974780
+random-if(cocoaWidget) == bug-442419-progressmeter-max.xul bug-442419-progressmeter-max-ref.xul # fails most of the time on Mac because progress meter animates
+!= textbox-multiline-default-value.xul textbox-multiline-empty.xul
--- a/toolkit/content/tests/unit/xpcshell.ini
+++ b/toolkit/content/tests/unit/xpcshell.ini
@@ -1,6 +1,5 @@
 [DEFAULT]
 head = 
 tail = 
-skip-if = toolkit == 'gonk'
 
 [test_contentAreaUtils.js]
--- a/toolkit/content/tests/widgets/chrome.ini
+++ b/toolkit/content/tests/widgets/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   tree_shared.js
   popup_shared.js
   window_menubar.xul
   seek_with_sound.ogg
 
 [test_contextmenu_nested.xul]
 skip-if = os == 'linux' # Bug 1116215
--- a/toolkit/content/tests/widgets/mochitest.ini
+++ b/toolkit/content/tests/widgets/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g'
 support-files =
   audio.wav
   audio.ogg
   seek_with_sound.ogg
   head.js
   tree_shared.js
   videocontrols_direction-1-ref.html
   videocontrols_direction-1a.html
--- a/toolkit/crashreporter/test/unit/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_crashreporter.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   crasher_subprocess_head.js
   crasher_subprocess_tail.js
 
 [test_crash_moz_crash.js]
 [test_crash_purevirtual.js]
 [test_crash_runtimeabort.js]
 [test_crash_after_js_oom_reported.js]
--- a/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit_ipc/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head =
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   !/toolkit/crashreporter/test/unit/crasher_subprocess_head.js
   !/toolkit/crashreporter/test/unit/crasher_subprocess_tail.js
   !/toolkit/crashreporter/test/unit/head_crashreporter.js
 
 [test_content_annotation.js]
 [test_content_exception_time_annotation.js]
 [test_content_oom_annotation_windows.js]
--- a/toolkit/forgetaboutsite/test/browser/browser.ini
+++ b/toolkit/forgetaboutsite/test/browser/browser.ini
@@ -1,5 +1,4 @@
 [DEFAULT]
 support-files = browser_clearplugindata.html
 
 [browser_clearplugindata.js]
-skip-if = buildapp == 'mulet'
--- a/toolkit/forgetaboutsite/test/unit/xpcshell.ini
+++ b/toolkit/forgetaboutsite/test/unit/xpcshell.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 head = head_forgetaboutsite.js ../../../../dom/push/test/xpcshell/head.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 support-files =
   !/dom/push/test/xpcshell/head.js
 
 [test_removeDataFromDomain.js]
--- a/toolkit/modules/tests/chrome/chrome.ini
+++ b/toolkit/modules/tests/chrome/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug544442_checkCert.xul]
--- a/toolkit/modules/tests/mochitest/mochitest.ini
+++ b/toolkit/modules/tests/mochitest/mochitest.ini
@@ -1,3 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+
 [test_spatial_navigation.html]
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -1,13 +1,11 @@
 [DEFAULT]
 head =
 tail =
-# Per-file skip-if is logical or'd with DEFAULT skip-if.
-skip-if = toolkit == 'gonk'
 support-files =
   propertyLists/bug710259_propertyListBinary.plist
   propertyLists/bug710259_propertyListXML.plist
   chromeappsstore.sqlite
   zips/zen.zip
 
 [test_BinarySearch.js]
 skip-if = toolkit == 'android'
--- a/toolkit/mozapps/downloads/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g' || os == 'android'
+skip-if = os == 'android'
 support-files =
   unknownContentType_dialog_layout_data.pif
   unknownContentType_dialog_layout_data.pif^headers^
   unknownContentType_dialog_layout_data.txt
   unknownContentType_dialog_layout_data.txt^headers^
 
 [test_unknownContentType_delayedbutton.xul]
 [test_unknownContentType_dialog_layout.xul]
--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet'
 tags = addons
 support-files =
   addons/*
   addon_about.xul
   addon_prefs.xul
   cancelCompatCheck.sjs
   discovery.html
   discovery_frame.html
--- a/toolkit/mozapps/extensions/test/mochitest/mochitest.ini
+++ b/toolkit/mozapps/extensions/test/mochitest/mochitest.ini
@@ -1,10 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 support-files =
   file_empty.html
   file_bug687194.xpi
 
 [test_bug609794.html]
 [test_bug687194.html]
 skip-if = e10s || os == "android" # this test creates its own child process, no need to run it in e10s
 [test_bug887098.html]
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
@@ -1,11 +1,11 @@
 # The file is shared between the two main xpcshell manifest files.
 [DEFAULT]
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 tags = addons
 
 [test_AddonRepository.js]
 [test_reload.js]
 # Bug 676992: test consistently hangs on Android
 # There's a problem removing a temp file without manually clearing the cache on Windows
 skip-if = os == "android" || os == "win"
 tags = webextensions
@@ -111,17 +111,17 @@ skip-if = os == "android"
 [test_bug470377_4.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_bug514327_1.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_bug514327_2.js]
 # Bug 676992: test consistently hangs on Android
-skip-if = buildapp == "mulet" || os == "android"
+skip-if = os == "android"
 [test_bug514327_3.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_bug521905.js]
 [test_bug526598.js]
 [test_bug541420.js]
 [test_bug542391.js]
 run-sequentially = Uses hardcoded ports in xpi files.
@@ -227,23 +227,22 @@ requesttimeoutfactor = 2
 [test_migrateAddonRepository.js]
 [test_migrate_max_version.js]
 [test_multiprocessCompatible.js]
 [test_no_addons.js]
 [test_onPropertyChanged_appDisabled.js]
 [test_permissions.js]
 [test_permissions_prefs.js]
 [test_plugins.js]
-skip-if = buildapp == "mulet"
 [test_pluginchange.js]
 # PluginProvider.jsm is not shipped on Android
 skip-if = os == "android"
 [test_pluginBlocklistCtp.js]
 # Bug 676992: test consistently fails on Android
-fail-if = buildapp == "mulet" || os == "android"
+fail-if = os == "android"
 [test_pref_properties.js]
 [test_registry.js]
 [test_safemode.js]
 [test_signed_updatepref.js]
 run-if = addon_signing
 skip-if = require_signing
 [test_signed_verify.js]
 run-if = addon_signing
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini
@@ -1,12 +1,12 @@
  [DEFAULT]
 head = head_addons.js head_unpack.js
 tail =
 firefox-appdir = browser
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 dupe-manifest =
 tags = addons
 
 [test_webextension_paths.js]
 tags = webextensions
 
 [include:xpcshell-shared.ini]
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 tags = addons
 head = head_addons.js
 tail =
 firefox-appdir = browser
 dupe-manifest =
 support-files =
   data/**
   xpcshell-shared.ini
--- a/toolkit/mozapps/extensions/test/xpinstall/browser.ini
+++ b/toolkit/mozapps/extensions/test/xpinstall/browser.ini
@@ -32,17 +32,16 @@ support-files =
   slowinstall.sjs
   startsoftwareupdate.html
   theme.xpi
   triggerredirect.html
   unsigned.xpi
 
 [browser_amosigned_trigger.js]
 [browser_amosigned_trigger_iframe.js]
-skip-if = buildapp == "mulet"
 [browser_amosigned_url.js]
 [browser_auth.js]
 [browser_auth2.js]
 [browser_auth3.js]
 [browser_auth4.js]
 [browser_badargs.js]
 [browser_badargs2.js]
 [browser_badhash.js]
@@ -101,19 +100,18 @@ skip-if = require_signing
 [browser_signed_url.js]
 skip-if = require_signing
 [browser_softwareupdate.js]
 [browser_switchtab.js]
 [browser_trigger_redirect.js]
 [browser_unsigned_trigger.js]
 skip-if = require_signing
 [browser_unsigned_trigger_iframe.js]
-skip-if = buildapp == "mulet" || require_signing
+skip-if = require_signing
 [browser_unsigned_trigger_xorigin.js]
-skip-if = buildapp == "mulet"
 [browser_unsigned_url.js]
 skip-if = require_signing
 [browser_whitelist.js]
 [browser_whitelist2.js]
 [browser_whitelist3.js]
 [browser_whitelist4.js]
 [browser_whitelist5.js]
 [browser_whitelist6.js]
--- a/toolkit/mozapps/update/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/update/tests/chrome/chrome.ini
@@ -1,15 +1,14 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 [DEFAULT]
 tags = appupdate
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
 support-files =
   utils.js
   update.sjs
 
 ; mochitest-chrome tests must start with "test_" and are executed in sorted
 ; order and not in the order specified in the manifest.
 [test_0010_background_basic.xul]
 [test_0011_check_basic.xul]
deleted file mode 100644
--- a/toolkit/mozapps/update/tests/unit_aus_update/downloadFileTooBig_gonk.js
+++ /dev/null
@@ -1,96 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-const KEY_UPDATE_ARCHIVE_DIR = "UpdArchD";
-
-var gActiveUpdate;
-var gDirService;
-var gDirProvider;
-var gOldProviders;
-
-function run_test() {
-  setupTestCommon();
-
-  debugDump("testing that error codes set from a directory provider propagate" +
-            "up to AUS.downloadUpdate() correctly (Bug 794211).");
-
-  start_httpserver();
-  setUpdateURLOverride(gURLData + gHTTPHandlerPath);
-  standardInit();
-
-  gDirProvider = new FakeDirProvider();
-
-  let cm = Cc["@mozilla.org/categorymanager;1"].getService(Ci.nsICategoryManager);
-  gOldProviders = [];
-  let enumerator = cm.enumerateCategory("xpcom-directory-providers");
-  while (enumerator.hasMoreElements()) {
-    let entry = enumerator.getNext().QueryInterface(Ci.nsISupportsCString).data;
-    let contractID = cm.getCategoryEntry("xpcom-directory-providers", entry);
-    gOldProviders.push(Cc[contractID].createInstance(Ci.nsIDirectoryServiceProvider));
-  }
-
-  gDirService = Cc["@mozilla.org/file/directory_service;1"].
-                getService(Ci.nsIProperties);
-
-  gOldProviders.forEach(function(p) {
-    gDirService.unregisterProvider(p);
-  });
-  gDirService.registerProvider(gDirProvider);
-
-  Services.prefs.setBoolPref(PREF_APP_UPDATE_SILENT, true);
-  do_execute_soon(run_test_pt1);
-}
-
-function run_test_pt1() {
-  gUpdates = null;
-  gUpdateCount = null;
-  gCheckFunc = check_test_pt1;
-
-  let patches = getRemotePatchString();
-  let updates = getRemoteUpdateString(patches);
-  gResponseBody = getRemoteUpdatesXMLString(updates);
-  gUpdateChecker.checkForUpdates(updateCheckListener, true);
-}
-
-function check_test_pt1() {
-  Assert.equal(gUpdateCount, 1,
-               "the update count" + MSG_SHOULD_EQUAL);
-
-  gActiveUpdate = gUpdates[0];
-  Assert.ok(!!gActiveUpdate,
-            "there should be an active update");
-
-  let state = gAUS.downloadUpdate(gActiveUpdate, true);
-  Assert.equal(state, STATE_NONE,
-               "the update state" + MSG_SHOULD_EQUAL);
-  Assert.equal(gActiveUpdate.errorCode >>> 0, Cr.NS_ERROR_FILE_TOO_BIG,
-               "the update error code" + MSG_SHOULD_EQUAL);
-
-  doTestFinish();
-}
-
-function end_test() {
-  gDirService.unregisterProvider(gDirProvider);
-  gOldProviders.forEach(function(p) {
-    gDirService.registerProvider(p);
-  });
-  gActiveUpdate = null;
-  gDirService = null;
-  gDirProvider = null;
-}
-
-function FakeDirProvider() {}
-FakeDirProvider.prototype = {
-  getFile: function FP_getFile(prop, persistent) {
-    if (prop == KEY_UPDATE_ARCHIVE_DIR) {
-      if (gActiveUpdate) {
-        gActiveUpdate.errorCode = Cr.NS_ERROR_FILE_TOO_BIG;
-      }
-    }
-    return null;
-  },
-  classID: Components.ID("{f30b43a7-2bfa-4e5f-8c4f-abc7dd4ac486}"),
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsIDirectoryServiceProvider])
-};
--- a/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
@@ -17,21 +17,11 @@ tail =
 [cleanupDownloadingForSameVersionAndBuildID.js]
 [cleanupDownloadingIncorrectStatus.js]
 [cleanupPendingVersionFileIncorrectStatus.js]
 [cleanupSuccessLogMove.js]
 [cleanupSuccessLogsFIFO.js]
 [downloadInterruptedRecovery.js]
 [downloadResumeForSameAppVersion.js]
 [downloadCompleteAfterPartialFailure.js]
-skip-if = buildapp == "mulet" || toolkit == 'gonk'
-reason = custom nsIUpdatePrompt
-[downloadFileTooBig_gonk.js]
-skip-if = toolkit != 'gonk'
 [uiSilentPref.js]
-skip-if = toolkit == 'gonk'
-reason = custom nsIUpdatePrompt
 [uiUnsupportedAlreadyNotified.js]
-skip-if = toolkit == 'gonk'
-reason = custom nsIUpdatePrompt
 [uiAutoPref.js]
-skip-if = toolkit == 'gonk'
-reason = custom nsIUpdatePrompt
--- a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
@@ -16,26 +16,26 @@ skip-if = os == 'win' && debug && (os_ve
 reason = bug 1291985
 [marSuccessPartial.js]
 skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985
 [marFailurePartial.js]
 skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985
 [marStageSuccessComplete.js]
-skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2') || toolkit == 'gonk' && debug == true
-reason = bug 1291985 and bug 1179091
+skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
+reason = bug 1291985
 [marStageSuccessPartial.js]
-skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2') || toolkit == 'gonk' && debug == true
-reason = bug 1291985 and bug 1179091
+skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
+reason = bug 1291985
 [marVersionDowngrade.js]
-skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2') || toolkit == 'gonk'
+skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985 and mar signing
 [marWrongChannel.js]
-skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2') || toolkit == 'gonk'
+skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985 and mar signing
 [marStageFailurePartial.js]
 skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985
 [marCallbackAppSuccessComplete_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
 [marCallbackAppSuccessPartial_win.js]
@@ -43,20 +43,20 @@ skip-if = os != 'win' || debug && (os_ve
 reason = Windows only test and bug 1291985
 [marCallbackAppStageSuccessComplete_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
 [marCallbackAppStageSuccessPartial_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
 [marAppInUseSuccessComplete.js]
-skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2') || toolkit == 'gonk'
+skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985 and bug 1164150
 [marAppInUseStageSuccessComplete_unix.js]
-skip-if = os == 'win' || toolkit == 'gonk'
+skip-if = os == 'win'
 reason = not a Windows test and bug 1164150
 [marAppInUseStageFailureComplete_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
 [marFileLockedFailureComplete_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
 [marFileLockedFailurePartial_win.js]
@@ -94,16 +94,16 @@ skip-if = os != 'win' || debug && (os_ve
 reason = Windows only test and bug 1291985
 [marAppApplyDirLockedStageFailure_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
 [marAppApplyUpdateAppBinInUseStageSuccess_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
 [marAppApplyUpdateSuccess.js]
-skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2') || toolkit == 'gonk'
+skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985 and bug 1164150
 [marAppApplyUpdateStageSuccess.js]
-skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2') || toolkit == 'gonk'
+skip-if = os == 'win' && debug && (os_version == '5.1' || os_version == '5.2')
 reason = bug 1291985 and bug 1164150
 [marWrongApplyToDirFailure_win.js]
 skip-if = os != 'win' || debug && (os_version == '5.1' || os_version == '5.2')
 reason = Windows only test and bug 1291985
--- a/toolkit/profile/test/chrome.ini
+++ b/toolkit/profile/test/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_create_profile.xul]
--- a/toolkit/themes/osx/mochitests/chrome.ini
+++ b/toolkit/themes/osx/mochitests/chrome.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_bug510426.xul]
--- a/toolkit/xre/test/mochitest.ini
+++ b/toolkit/xre/test/mochitest.ini
@@ -1,4 +1,3 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
 
 [test_fpuhandler.html]
--- a/tools/profiler/tests/xpcshell.ini
+++ b/tools/profiler/tests/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_profiler.js
 tail =
-skip-if = toolkit == 'android' || toolkit == 'gonk'
+skip-if = toolkit == 'android'
 
 [test_start.js]
 skip-if = true
 [test_get_features.js]
 [test_shared_library.js]
 [test_run.js]
 skip-if = true
 [test_pause.js]