Bug 1066735 - Remove root b2g and android specific xpcshell manifests. r=chmanchester, a=test-only
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 07 Oct 2014 18:18:28 -0400
changeset 225494 ed870ea3cdb8f68d439051329d5290c0323b7d88
parent 225493 61f812b1c9345b85673b1cd6f25f9ba7e0e404d9
child 225495 02279066be65ed7f5a6e7c356c03a03252655b5e
push id3979
push userraliiev@mozilla.com
push dateMon, 13 Oct 2014 16:35:44 +0000
treeherdermozilla-beta@30f2cc610691 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester, test-only
bugs1066735
milestone34.0a2
Bug 1066735 - Remove root b2g and android specific xpcshell manifests. r=chmanchester, a=test-only
browser/components/dirprovider/tests/unit/xpcshell.ini
browser/components/downloads/test/unit/xpcshell.ini
browser/components/feeds/test/unit/xpcshell.ini
browser/components/loop/test/xpcshell/xpcshell.ini
browser/components/migration/tests/unit/xpcshell.ini
browser/components/places/tests/unit/xpcshell.ini
browser/components/sessionstore/test/unit/xpcshell.ini
browser/components/shell/test/unit/xpcshell.ini
browser/components/translation/test/unit/xpcshell.ini
browser/devtools/shared/test/unit/xpcshell.ini
browser/devtools/styleinspector/test/unit/xpcshell.ini
browser/experiments/test/xpcshell/xpcshell.ini
browser/modules/test/unit/social/xpcshell.ini
chrome/test/unit/xpcshell.ini
chrome/test/unit_ipc/xpcshell.ini
content/base/test/unit/xpcshell.ini
content/base/test/unit_ipc/xpcshell.ini
content/test/unit/xpcshell.ini
docshell/test/unit/xpcshell.ini
docshell/test/unit_ipc/xpcshell.ini
dom/activities/tests/unit/xpcshell.ini
dom/encoding/test/unit/xpcshell.ini
dom/indexedDB/test/unit/xpcshell.ini
dom/json/test/unit/xpcshell.ini
dom/network/tests/unit/xpcshell.ini
dom/network/tests/unit_ipc/xpcshell.ini
dom/notification/test/unit/xpcshell.ini
dom/payment/tests/unit/xpcshell.ini
dom/permission/tests/unit/xpcshell.ini
dom/plugins/test/unit/xpcshell.ini
dom/tests/unit/xpcshell.ini
dom/workers/test/xpcshell/xpcshell.ini
embedding/tests/unit/xpcshell.ini
extensions/cookie/test/unit/xpcshell.ini
extensions/cookie/test/unit_ipc/xpcshell.ini
extensions/spellcheck/hunspell/tests/unit/xpcshell.ini
gfx/tests/unit/xpcshell.ini
image/test/unit/xpcshell.ini
intl/locale/tests/unit/xpcshell.ini
intl/strres/tests/unit/xpcshell.ini
intl/uconv/tests/unit/xpcshell.ini
intl/unicharutil/tests/unit/xpcshell.ini
ipc/testshell/tests/xpcshell.ini
js/ductwork/debugger/tests/xpcshell.ini
js/xpconnect/tests/unit/xpcshell.ini
modules/libjar/test/unit/xpcshell.ini
modules/libjar/zipwriter/test/unit/xpcshell.ini
modules/libmar/tests/unit/xpcshell.ini
modules/libpref/test/unit/xpcshell.ini
modules/libpref/test/unit_ipc/xpcshell.ini
netwerk/cookie/test/unit/xpcshell.ini
netwerk/cookie/test/unit_ipc/xpcshell.ini
netwerk/test/httpserver/test/xpcshell.ini
netwerk/test/unit/xpcshell.ini
netwerk/test/unit_ipc/xpcshell.ini
parser/xml/test/unit/xpcshell.ini
rdf/tests/unit/xpcshell.ini
security/manager/ssl/tests/unit/xpcshell-smartcards.ini
security/manager/ssl/tests/unit/xpcshell.ini
services/cloudsync/tests/xpcshell/xpcshell.ini
services/common/tests/unit/xpcshell.ini
services/crypto/component/tests/unit/xpcshell.ini
services/crypto/tests/unit/xpcshell.ini
services/datareporting/tests/xpcshell/xpcshell.ini
services/fxaccounts/tests/xpcshell/xpcshell.ini
services/healthreport/tests/xpcshell/xpcshell.ini
services/metrics/tests/xpcshell/xpcshell.ini
services/mobileid/tests/xpcshell/xpcshell.ini
services/sync/tests/unit/xpcshell.ini
storage/test/unit/xpcshell.ini
testing/config/mozharness/android_arm_config.py
testing/config/mozharness/android_panda_config.py
testing/config/mozharness/android_x86_config.py
testing/config/mozharness/b2g_emulator_config.py
testing/modules/tests/xpcshell/xpcshell.ini
testing/xpcshell/Makefile.in
testing/xpcshell/example/unit/xpcshell.ini
testing/xpcshell/mach_commands.py
testing/xpcshell/xpcshell_android.ini
testing/xpcshell/xpcshell_b2g.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/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/unit/xpcshell.ini
toolkit/components/downloads/test/unit/xpcshell.ini
toolkit/components/feeds/test/xpcshell.ini
toolkit/components/filepicker/test/unit/xpcshell.ini
toolkit/components/formautofill/test/xpcshell/xpcshell.ini
toolkit/components/jsdownloads/test/unit/xpcshell.ini
toolkit/components/mediasniffer/test/unit/xpcshell.ini
toolkit/components/osfile/tests/xpcshell/xpcshell.ini
toolkit/components/passwordmgr/test/unit/xpcshell.ini
toolkit/components/places/tests/autocomplete/xpcshell.ini
toolkit/components/places/tests/bookmarks/xpcshell.ini
toolkit/components/places/tests/expiration/xpcshell.ini
toolkit/components/places/tests/favicons/xpcshell.ini
toolkit/components/places/tests/inline/xpcshell.ini
toolkit/components/places/tests/migration/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/satchel/test/unit/xpcshell.ini
toolkit/components/search/tests/xpcshell/xpcshell.ini
toolkit/components/social/test/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/url-classifier/tests/unit/xpcshell.ini
toolkit/components/urlformatter/tests/unit/xpcshell.ini
toolkit/components/workerlz4/tests/xpcshell/xpcshell.ini
toolkit/components/xulstore/tests/xpcshell/xpcshell.ini
toolkit/content/tests/unit/xpcshell.ini
toolkit/crashreporter/test/unit/xpcshell.ini
toolkit/crashreporter/test/unit_ipc/xpcshell.ini
toolkit/devtools/acorn/tests/unit/xpcshell.ini
toolkit/devtools/apps/tests/unit/xpcshell.ini
toolkit/devtools/jsbeautify/tests/unit/xpcshell.ini
toolkit/devtools/pretty-fast/tests/unit/xpcshell.ini
toolkit/devtools/security/tests/unit/xpcshell.ini
toolkit/devtools/server/tests/unit/xpcshell.ini
toolkit/devtools/tern/tests/unit/xpcshell.ini
toolkit/devtools/tests/unit/xpcshell.ini
toolkit/devtools/transport/tests/unit/xpcshell.ini
toolkit/devtools/webconsole/test/unit/xpcshell.ini
toolkit/forgetaboutsite/test/unit/xpcshell.ini
toolkit/identity/tests/unit/xpcshell.ini
toolkit/modules/tests/xpcshell/xpcshell.ini
toolkit/mozapps/downloads/tests/unit/xpcshell.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/update/tests/unit_aus_update/xpcshell.ini
toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini
tools/profiler/tests/xpcshell.ini
uriloader/exthandler/tests/unit/xpcshell.ini
widget/tests/unit/xpcshell.ini
xpcom/tests/unit/xpcshell.ini
--- a/browser/components/dirprovider/tests/unit/xpcshell.ini
+++ b/browser/components/dirprovider/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = head_dirprovider.js
 tail = 
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_bookmark_pref.js]
 [test_keys.js]
--- a/browser/components/downloads/test/unit/xpcshell.ini
+++ b/browser/components/downloads/test/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_DownloadsCommon.js]
--- a/browser/components/feeds/test/unit/xpcshell.ini
+++ b/browser/components/feeds/test/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = head_feeds.js
 tail = 
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_355473.js]
 [test_758990.js]
--- a/browser/components/loop/test/xpcshell/xpcshell.ini
+++ b/browser/components/loop/test/xpcshell/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'gonk'
 
 [test_loopapi_hawk_request.js]
 [test_looppush_initialize.js]
 [test_loopservice_dnd.js]
 [test_loopservice_expiry.js]
 [test_loopservice_loop_prefs.js]
 [test_loopservice_initialize.js]
 [test_loopservice_locales.js]
--- a/browser/components/migration/tests/unit/xpcshell.ini
+++ b/browser/components/migration/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = head_migration.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_IE_bookmarks.js]
 skip-if = os != "win"
--- a/browser/components/places/tests/unit/xpcshell.ini
+++ b/browser/components/places/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   bookmarks.glue.html
   bookmarks.glue.json
   corruptDB.sqlite
   distribution.ini
 
 [test_421483.js]
 [test_browserGlue_bookmarkshtml.js]
--- a/browser/components/sessionstore/test/unit/xpcshell.ini
+++ b/browser/components/sessionstore/test/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/sessionCheckpoints_all.json
   data/sessionstore_invalid.js
   data/sessionstore_valid.js
 
 [test_backup_once.js]
 [test_startup_nosession_async.js]
 [test_startup_session_async.js]
--- a/browser/components/shell/test/unit/xpcshell.ini
+++ b/browser/components/shell/test/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_421977.js]
--- a/browser/components/translation/test/unit/xpcshell.ini
+++ b/browser/components/translation/test/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = 
 tail = 
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_cld2.js]
 [test_healthreport.js]
--- a/browser/devtools/shared/test/unit/xpcshell.ini
+++ b/browser/devtools/shared/test/unit/xpcshell.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
 head =
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_bezierCanvas.js]
 [test_cubicBezier.js]
 [test_undoStack.js]
--- a/browser/devtools/styleinspector/test/unit/xpcshell.ini
+++ b/browser/devtools/styleinspector/test/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head =
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_parseDeclarations.js]
 [test_parseSingleValue.js]
--- a/browser/experiments/test/xpcshell/xpcshell.ini
+++ b/browser/experiments/test/xpcshell/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   experiments_1.manifest
   experiment-1.xpi
   experiment-1a.xpi
   experiment-2.xpi
   experiment-racybranch.xpi
 generated-files =
   experiment-1.xpi
--- a/browser/modules/test/unit/social/xpcshell.ini
+++ b/browser/modules/test/unit/social/xpcshell.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files = blocklist.xml
 
 [test_social.js]
 [test_socialDisabledStartup.js]
--- a/chrome/test/unit/xpcshell.ini
+++ b/chrome/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_crtestutils.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files = data/**
 
 [test_abi.js]
 [test_bug292789.js]
 [test_bug380398.js]
 [test_bug397073.js]
 [test_bug399707.js]
 [test_bug401153.js]
--- a/chrome/test/unit_ipc/xpcshell.ini
+++ b/chrome/test/unit_ipc/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_resolve_uris_ipc.js]
--- a/content/base/test/unit/xpcshell.ini
+++ b/content/base/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_utilities.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   1_original.xml
   1_result.xml
   2_original.xml
   2_result_1.xml
   2_result_2.xml
   2_result_3.xml
   2_result_4.xml
--- a/content/base/test/unit_ipc/xpcshell.ini
+++ b/content/base/test/unit_ipc/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_bug553888_wrap.js]
 [test_xhr_document_ipc.js]
--- a/content/test/unit/xpcshell.ini
+++ b/content/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_content.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   empty_document.xml
   isequalnode_data.xml
   nodelist_data_1.xml
   nodelist_data_2.xul
   test_delete_range.xml
 
 [test_isequalnode.js]
--- a/docshell/test/unit/xpcshell.ini
+++ b/docshell/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_docshell.js
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_bug414201_jfif.js]
 [test_bug442584.js]
 [test_nsDefaultURIFixup.js]
 [test_nsDefaultURIFixup_search.js]
 skip-if = os == 'android'
 [test_nsDefaultURIFixup_info.js]
 skip-if = os == 'android'
--- a/docshell/test/unit_ipc/xpcshell.ini
+++ b/docshell/test/unit_ipc/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_pb_notification_ipc.js]
 # Bug 751575: Perma-fails with: command timed out: 1200 seconds without output
 skip-if = true
--- a/dom/activities/tests/unit/xpcshell.ini
+++ b/dom/activities/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 
 [test_activityFilters.js]
--- a/dom/encoding/test/unit/xpcshell.ini
+++ b/dom/encoding/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'gonk'
 
 [test_misc.js]
 [test_utf.js]
 
 [test_big5.js]
 [test_euc-jp.js]
 [test_euc-kr.js]
 [test_gbk.js]
--- a/dom/indexedDB/test/unit/xpcshell.ini
+++ b/dom/indexedDB/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   GlobalObjectsChild.js
   GlobalObjectsComponent.js
   GlobalObjectsComponent.manifest
   GlobalObjectsModule.jsm
   GlobalObjectsSandbox.js
 
 # When adding files here please also update ipc/unit/xpcshell.ini!
--- a/dom/json/test/unit/xpcshell.ini
+++ b/dom/json/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   decodeFromStream-01.json
   decodeFromStream-small.json
 
 [test_decodeFromStream.js]
 [test_decode_long_input.js]
 [test_encode.js]
 
--- a/dom/network/tests/unit/xpcshell.ini
+++ b/dom/network/tests/unit/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 
 [test_tcpsocket.js]
 [test_multisend.js]
 [test_tcpserversocket.js]
 run-sequentially = Uses hardcoded port, bug 903830.
 skip-if = os == 'mac' # bug 953208 - frequent timeouts on OSX
--- a/dom/network/tests/unit_ipc/xpcshell.ini
+++ b/dom/network/tests/unit_ipc/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_tcpsocket_ipc.js]
 [test_tcpserversocket_ipc.js]
 run-sequentially = Uses hardcoded port, bug 903830.
--- a/dom/notification/test/unit/xpcshell.ini
+++ b/dom/notification/test/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = common_test_notificationdb.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_notificationdb.js]
 [test_notificationdb_bug1024090.js]
--- a/dom/payment/tests/unit/xpcshell.ini
+++ b/dom/payment/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = header_helper.js
 tail =
+skip-if = toolkit == 'gonk'
 
 [test_paymanager_get_payment_request.js]
--- a/dom/permission/tests/unit/xpcshell.ini
+++ b/dom/permission/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 
 [test_bug808734.js]
--- a/dom/plugins/test/unit/xpcshell.ini
+++ b/dom/plugins/test/unit/xpcshell.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet'
+skip-if = buildapp == 'mulet' || toolkit == 'android' || toolkit == 'gonk'
 head = head_plugins.js
 tail = 
 
 [test_bug455213.js]
 # Bug 676953: test fails consistently on Android
 fail-if = os == "android"
 [test_bug471245.js]
 # Bug 676953: test fails consistently on Android
--- a/dom/tests/unit/xpcshell.ini
+++ b/dom/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_bug319968.js]
 [test_bug465752.js]
 [test_geolocation_provider.js]
 # Bug 684962: test hangs consistently on Android
 skip-if = os == "android"
 [test_geolocation_timeout.js]
 # Bug 919946: test hangs consistently on Android
--- a/dom/workers/test/xpcshell/xpcshell.ini
+++ b/dom/workers/test/xpcshell/xpcshell.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/worker.js
   data/chrome.manifest
 
 [test_workers.js]
--- a/embedding/tests/unit/xpcshell.ini
+++ b/embedding/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_wwauthpromptfactory.js]
 [test_wwpromptfactory.js]
--- a/extensions/cookie/test/unit/xpcshell.ini
+++ b/extensions/cookie/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_cookies.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   cookieprompt.js
   cookieprompt.manifest
 
 [test_bug526789.js]
 [test_bug650522.js]
 [test_bug667087.js]
 [test_cookies_async_failure.js]
--- a/extensions/cookie/test/unit_ipc/xpcshell.ini
+++ b/extensions/cookie/test/unit_ipc/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_child.js]
 [test_parent.js]
--- a/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini
+++ b/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files = data/**
 
 [test_hunspell.js]
--- a/gfx/tests/unit/xpcshell.ini
+++ b/gfx/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_nsIScriptableRegion.js]
--- a/image/test/unit/xpcshell.ini
+++ b/image/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   async_load_tests.js
   bug413512.ico
   bug815359.ico
   image1.png
   image1png16x16.jpg
   image1png64x64.jpg
   image2.jpg
--- a/intl/locale/tests/unit/xpcshell.ini
+++ b/intl/locale/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_bug22310.js]
 run-if = toolkit == "windows" || toolkit == "cocoa"
 
 [test_bug371611.js]
 [test_bug374040.js]
 skip-if = toolkit == "windows" || toolkit == "cocoa"
 
--- a/intl/strres/tests/unit/xpcshell.ini
+++ b/intl/strres/tests/unit/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   397093.properties
   strres.properties
 
 [test_bug378839.js]
 [test_bug397093.js]
--- a/intl/uconv/tests/unit/xpcshell.ini
+++ b/intl/uconv/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   CharsetConversionTests.js
   hangulTestStrings.js
   data/unicode-conversion.utf16.txt
   data/unicode-conversion.utf16be.txt
   data/unicode-conversion.utf16le.txt
   data/unicode-conversion.utf8.txt
 
--- a/intl/unicharutil/tests/unit/xpcshell.ini
+++ b/intl/unicharutil/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_bug_427350_1.js]
--- a/ipc/testshell/tests/xpcshell.ini
+++ b/ipc/testshell/tests/xpcshell.ini
@@ -1,10 +1,11 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'android'
 
 [test_ipcshell.js]
 # Bug 676963: test fails consistently on Android
 fail-if = os == "android"
 skip-if = toolkit == "gonk"
 reason = bug 820380
 [test_ipcshell_child.js]
--- a/js/ductwork/debugger/tests/xpcshell.ini
+++ b/js/ductwork/debugger/tests/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = head_dbg.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_nativewrappers.js]
 # Bug 685068
 fail-if = os == "android"
--- a/js/xpconnect/tests/unit/xpcshell.ini
+++ b/js/xpconnect/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   CatRegistrationComponents.manifest
   bogus_element_type.jsm
   bogus_exports_type.jsm
   bug451678_subscript.js
   component-blob.js
   component-blob.manifest
   component-file.js
--- a/modules/libjar/test/unit/xpcshell.ini
+++ b/modules/libjar/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_ipc.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/empty
   data/test_bug333423.zip
   data/test_bug336691.zip
   data/test_bug370103.jar
   data/test_bug379841.zip
   data/test_bug589292.zip
   data/test_bug597702.zip
--- a/modules/libjar/zipwriter/test/unit/xpcshell.ini
+++ b/modules/libjar/zipwriter/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_zipwriter.js
 tail = tail_zipwriter.js
+skip-if = toolkit == 'gonk'
 support-files =
   data/test_bug446708/thumbs/st14-1.tiff
   data/emptyfile.txt
   data/smallfile.txt
   data/test.png
   data/test.txt
   data/test.zip
   data/test_bug399727.html
--- a/modules/libmar/tests/unit/xpcshell.ini
+++ b/modules/libmar/tests/unit/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head = head_libmar.js
 tail =
 generated-files = head_libmar.js
+skip-if = toolkit == 'gonk'
 support-files = data/**
 
 [test_create.js]
 [test_extract.js]
 [test_sign_verify.js]
--- a/modules/libpref/test/unit/xpcshell.ini
+++ b/modules/libpref/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_libPrefs.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   data/testPref.js
   extdata/testExt.js
 
 [test_warnings.js]
 [test_bug345529.js]
 [test_bug506224.js]
 [test_bug577950.js]
--- a/modules/libpref/test/unit_ipc/xpcshell.ini
+++ b/modules/libpref/test/unit_ipc/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_existing_prefs.js]
 [test_initial_prefs.js]
 [test_observed_prefs.js]
 [test_update_prefs.js]
 [test_user_default_prefs.js]
--- a/netwerk/cookie/test/unit/xpcshell.ini
+++ b/netwerk/cookie/test/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_bug643051.js]
 [test_parser_0001.js]
 [test_parser_0019.js]
--- a/netwerk/cookie/test/unit_ipc/xpcshell.ini
+++ b/netwerk/cookie/test/unit_ipc/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_ipc_parser_0001.js]
 [test_ipc_parser_0019.js]
--- a/netwerk/test/httpserver/test/xpcshell.ini
+++ b/netwerk/test/httpserver/test/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_utils.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files = data/**
 
 [test_async_response_sending.js]
 [test_basic_functionality.js]
 [test_body_length.js]
 [test_byte_range.js]
 [test_cern_meta.js]
 [test_default_index_handler.js]
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_channels.js head_cache.js head_cache2.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   data/image.png
   data/system_root.lnk
   data/test_psl.txt
   data/test_readline1.txt
   data/test_readline2.txt
   data/test_readline3.txt
   data/test_readline4.txt
--- a/netwerk/test/unit_ipc/xpcshell.ini
+++ b/netwerk/test/unit_ipc/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_channels_clone.js head_cc.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files = disabled_test_bug528292_wrap.js
 
 [test_bug248970_cookie_wrap.js]
 [test_cacheflags_wrap.js]
 [test_cache_jar_wrap.js]
 [test_channel_close_wrap.js]
 [test_cookie_header_wrap.js]
 [test_cookiejars_wrap.js]
--- a/parser/xml/test/unit/xpcshell.ini
+++ b/parser/xml/test/unit/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files = results.js
 
 [test_parser.js]
 [test_namespace_support.js]
 [test_xml_declaration.js]
 [test_sanitizer.js]
--- a/rdf/tests/unit/xpcshell.ini
+++ b/rdf/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files = sample.rdf
 
 [test_rdfredirect.js]
--- a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
+++ b/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
 head = head_psm.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
 
 [test_pkcs11_insert_remove.js]
 # Bug 1049969: this test doesn't work on windows
 skip-if = os == "win"
--- a/security/manager/ssl/tests/unit/xpcshell.ini
+++ b/security/manager/ssl/tests/unit/xpcshell.ini
@@ -20,17 +20,17 @@ support-files =
   test_pinning_dynamic/**
 
 [test_datasignatureverifier.js]
 [test_hash_algorithms.js]
 [test_hmac.js]
 
 [test_sts_preloadlist_perwindowpb.js]
 # Bug 978426: Test fails consistently only on B2G ARM
-skip-if = buildapp == "b2g" && processor = "arm"
+skip-if = buildapp == "b2g" && processor == "arm"
 
 [test_sts_preloadlist_selfdestruct.js]
 [test_sts_holepunch.js]
 [test_sts_ipv4_ipv6.js]
 
 [test_sss_eviction.js]
 [test_sss_readstate.js]
 [test_sss_readstate_empty.js]
--- a/services/cloudsync/tests/xpcshell/xpcshell.ini
+++ b/services/cloudsync/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_module.js]
 [test_tabs.js]
 [test_bookmarks.js]
 [test_lazyload.js]
--- a/services/common/tests/unit/xpcshell.ini
+++ b/services/common/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head_global.js head_helpers.js head_http.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'gonk'
 
 # Test load modules first so syntax failures are caught early.
 [test_load_modules.js]
 
 [test_utils_atob.js]
 [test_utils_convert_string.js]
 [test_utils_dateprefs.js]
 [test_utils_deepCopy.js]
--- a/services/crypto/component/tests/unit/xpcshell.ini
+++ b/services/crypto/component/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
 firefox-appdir = browser
+skip-if = toolkit == 'gonk'
 
 [test_jpake.js]
--- a/services/crypto/tests/unit/xpcshell.ini
+++ b/services/crypto/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head_helpers.js ../../../common/tests/unit/head_helpers.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'gonk'
 
 [test_load_modules.js]
 
 [test_crypto_crypt.js]
 [test_crypto_deriveKey.js]
 [test_crypto_random.js]
 # Bug 676977: test hangs consistently on Android
 skip-if = os == "android"
--- a/services/datareporting/tests/xpcshell/xpcshell.ini
+++ b/services/datareporting/tests/xpcshell/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_policy.js]
 [test_session_recorder.js]
--- a/services/fxaccounts/tests/xpcshell/xpcshell.ini
+++ b/services/fxaccounts/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js ../../../common/tests/unit/head_helpers.js ../../../common/tests/unit/head_http.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_accounts.js]
 [test_client.js]
 [test_credentials.js]
 [test_loginmgr_storage.js]
 skip-if = appname == 'b2g' # login manager storage only used on desktop.
 [test_manager.js]
 run-if = appname == 'b2g'
--- a/services/healthreport/tests/xpcshell/xpcshell.ini
+++ b/services/healthreport/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_load_modules.js]
 [test_profile.js]
 [test_healthreporter.js]
 [test_provider_addons.js]
 skip-if = buildapp == 'mulet'
 [test_provider_appinfo.js]
 [test_provider_crashes.js]
--- a/services/metrics/tests/xpcshell/xpcshell.ini
+++ b/services/metrics/tests/xpcshell/xpcshell.ini
@@ -1,8 +1,9 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_load_modules.js]
 [test_metrics_provider.js]
 [test_metrics_provider_manager.js]
 [test_metrics_storage.js]
--- a/services/mobileid/tests/xpcshell/xpcshell.ini
+++ b/services/mobileid/tests/xpcshell/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'gonk'
 
 [test_mobileid_manager.js]
 [test_mobileid_client.js]
--- a/services/sync/tests/unit/xpcshell.ini
+++ b/services/sync/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head_appinfo.js ../../../common/tests/unit/head_helpers.js head_helpers.js head_http_server.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'gonk'
 support-files =
   addon1-search.xml
   bootstrap1-search.xml
   fake_login_manager.js
   missing-sourceuri.xml
   missing-xpi-search.xml
   places_v10_from_v11.sqlite
   rewrite-search.xml
--- a/storage/test/unit/xpcshell.ini
+++ b/storage/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_storage.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   corruptDB.sqlite
   fakeDB.sqlite
   locale_collation.txt
   vacuumParticipant.js
   vacuumParticipant.manifest
 
 [test_bug-365166.js]
--- a/testing/config/mozharness/android_arm_config.py
+++ b/testing/config/mozharness/android_arm_config.py
@@ -27,13 +27,13 @@ config = {
             ],
         },
         "xpcshell": {
             "run_filename": "remotexpcshelltests.py",
             "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s",
                 "--apk=%(installer_path)s", "--no-logfiles",
                 "--symbols-path=%(symbols_path)s",
-                "--manifest=tests/xpcshell_android.ini",
+                "--manifest=tests/xpcshell.ini",
             ],
         },
     }, # end suite_definitions
 }
--- a/testing/config/mozharness/android_panda_config.py
+++ b/testing/config/mozharness/android_panda_config.py
@@ -50,17 +50,17 @@ config = {
         "--app=%(app_name)s", "--console-level=INFO",
         "--http-port=%(http_port)s", "--ssl-port=%(ssl_port)s",
         "--symbols-path=%(symbols_path)s",
         "--robocop=mochitest/robocop.ini"
     ],
     "xpcshell_options": [
         "--deviceIP=%(device_ip)s",
         "--xre-path=../hostutils/xre",
-        "--manifest=xpcshell/tests/xpcshell_android.ini",
+        "--manifest=xpcshell/tests/xpcshell.ini",
         "--build-info-json=xpcshell/mozinfo.json",
         "--testing-modules-dir=modules",
         "--local-lib-dir=../fennec",
         "--apk=../%(apk_name)s",
         "--no-logfiles",
         "--symbols-path=%(symbols_path)s"
     ],
     "jittest_options": [
--- a/testing/config/mozharness/android_x86_config.py
+++ b/testing/config/mozharness/android_x86_config.py
@@ -27,13 +27,13 @@ config = {
             ],
         },
         "xpcshell": {
             "run_filename": "remotexpcshelltests.py",
             "options": ["--deviceIP=%(device_ip)s", "--devicePort=%(device_port)s",
                 "--xre-path=%(xre_path)s", "--testing-modules-dir=%(modules_dir)s",
                 "--apk=%(installer_path)s", "--no-logfiles",
                 "--symbols-path=%(symbols_path)s",
-                "--manifest=tests/xpcshell_android.ini",
+                "--manifest=tests/xpcshell.ini",
             ],
         },
     }, # end suite_definitions
 }
--- a/testing/config/mozharness/b2g_emulator_config.py
+++ b/testing/config/mozharness/b2g_emulator_config.py
@@ -39,17 +39,17 @@ config = {
         "--remote-webserver=%(remote_webserver)s", "--ignore-window-size",
         "--xre-path=%(xre_path)s", "--symbols-path=%(symbols_path)s", "--busybox=%(busybox)s",
         "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s",
         "tests/testing/crashtest/crashtests.list",
     ],
 
     "xpcshell_options": [
         "--adbpath=%(adbpath)s", "--b2gpath=%(b2gpath)s", "--emulator=%(emulator)s",
-        "--logdir=%(logcat_dir)s", "--manifest=tests/xpcshell_b2g.ini", "--use-device-libs",
+        "--logdir=%(logcat_dir)s", "--manifest=tests/xpcshell.ini", "--use-device-libs",
         "--testing-modules-dir=%(modules_dir)s", "--symbols-path=%(symbols_path)s",
         "--busybox=%(busybox)s", "--total-chunks=%(total_chunks)s", "--this-chunk=%(this_chunk)s",
     ],
 
     "cppunittest_options": [
         "--dm_trans=adb",
         "--symbols-path=%(symbols_path)s",
         "--xre-path=%(xre_path)s",
--- a/testing/modules/tests/xpcshell/xpcshell.ini
+++ b/testing/modules/tests/xpcshell/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_assert.js]
 [test_structuredlog.js]
--- a/testing/xpcshell/Makefile.in
+++ b/testing/xpcshell/Makefile.in
@@ -29,18 +29,16 @@ TEST_HARNESS_COMPONENTS := \
   httpd.js \
   httpd.manifest \
   $(NULL)
 
 # Rules for staging the necessary harness bits for a test package
 PKG_STAGE = $(DIST)/test-stage
 
 libs::
-	$(INSTALL) $(srcdir)/xpcshell_b2g.ini $(DEPTH)/_tests/xpcshell
-	$(INSTALL) $(srcdir)/xpcshell_android.ini $(DEPTH)/_tests/xpcshell
 	cp $(DEPTH)/_tests/xpcshell/xpcshell.ini $(DEPTH)/_tests/xpcshell/all-test-dirs.list
 
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/xpcshell/tests
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_HARNESS_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@(cd $(topsrcdir)/build && tar $(TAR_CREATE_FLAGS) - $(EXTRA_BUILD_FILES)) | (cd $(PKG_STAGE)/xpcshell && tar -xf -)
 	@cp $(DEPTH)/mozinfo.json $(PKG_STAGE)/xpcshell
 	@cp $(DEPTH)/build/automation.py $(PKG_STAGE)/xpcshell
--- a/testing/xpcshell/example/unit/xpcshell.ini
+++ b/testing/xpcshell/example/unit/xpcshell.ini
@@ -1,15 +1,16 @@
 ; 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]
 head =
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   subdir/file.txt
   file.txt
   import_module.jsm
   import_sub_module.jsm
   load_subscript.js
   location_load.js
 
--- a/testing/xpcshell/mach_commands.py
+++ b/testing/xpcshell/mach_commands.py
@@ -258,17 +258,17 @@ class AndroidXPCShellRunner(MozbuildObje
         options.debuggerArgs = None
         options.setup = not no_setup
         options.keepGoing = keep_going
         options.objdir = self.topobjdir
         options.localLib = os.path.join(self.topobjdir, 'dist/fennec')
         options.localBin = os.path.join(self.topobjdir, 'dist/bin')
         options.testingModulesDir = os.path.join(self.topobjdir, '_tests/modules')
         options.mozInfo = os.path.join(self.topobjdir, 'mozinfo.json')
-        options.manifest = os.path.join(self.topobjdir, '_tests/xpcshell/xpcshell_android.ini')
+        options.manifest = os.path.join(self.topobjdir, '_tests/xpcshell/xpcshell.ini')
         options.symbolsPath = os.path.join(self.distdir, 'crashreporter-symbols')
         if local_apk:
             options.localAPK = local_apk
         else:
             for file in os.listdir(os.path.join(options.objdir, "dist")):
                 if file.endswith(".apk") and file.startswith("fennec"):
                     options.localAPK = os.path.join(options.objdir, "dist")
                     options.localAPK = os.path.join(options.localAPK, file)
@@ -380,17 +380,17 @@ class B2GXPCShellRunner(MozbuildObject):
         parser = runtestsb2g.B2GOptions()
         options, args = parser.parse_args([])
 
         options.b2g_path = b2g_home
         options.busybox = busybox or os.environ.get('BUSYBOX')
         options.localLib = self.bin_dir
         options.localBin = self.bin_dir
         options.logdir = self.xpcshell_dir
-        options.manifest = os.path.join(self.xpcshell_dir, 'xpcshell_b2g.ini')
+        options.manifest = os.path.join(self.xpcshell_dir, 'xpcshell.ini')
         options.mozInfo = os.path.join(self.topobjdir, 'mozinfo.json')
         options.objdir = self.topobjdir
         options.symbolsPath = os.path.join(self.distdir, 'crashreporter-symbols'),
         options.testingModulesDir = os.path.join(self.tests_dir, 'modules')
         options.testsRootDir = self.xpcshell_dir
         options.testPath = test_path
         options.use_device_libs = True
 
deleted file mode 100644
--- a/testing/xpcshell/xpcshell_android.ini
+++ /dev/null
@@ -1,58 +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/.
-
-[include:browser/components/loop/test/xpcshell/xpcshell.ini]
-[include:chrome/test/unit/xpcshell.ini]
-[include:content/base/test/unit/xpcshell.ini]
-[include:content/test/unit/xpcshell.ini]
-[include:docshell/test/unit/xpcshell.ini]
-[include:dom/activities/tests/unit/xpcshell.ini]
-[include:dom/apps/tests/unit/xpcshell.ini]
-[include:dom/encoding/test/unit/xpcshell.ini]
-[include:dom/indexedDB/test/unit/xpcshell.ini]
-[include:dom/json/test/unit/xpcshell.ini]
-[include:dom/mobilemessage/tests/xpcshell/xpcshell.ini]
-[include:dom/network/tests/unit/xpcshell.ini]
-[include:dom/network/tests/unit_stats/xpcshell.ini]
-[include:dom/payment/tests/unit/xpcshell.ini]
-[include:dom/permission/tests/unit/xpcshell.ini]
-[include:dom/resourcestats/tests/xpcshell/xpcshell.ini]
-[include:dom/tests/unit/xpcshell.ini]
-[include:embedding/tests/unit/xpcshell.ini]
-[include:gfx/tests/unit/xpcshell.ini]
-[include:image/test/unit/xpcshell.ini]
-[include:intl/locale/tests/unit/xpcshell.ini]
-[include:intl/strres/tests/unit/xpcshell.ini]
-[include:intl/uconv/tests/unit/xpcshell.ini]
-[include:intl/unicharutil/tests/unit/xpcshell.ini]
-[include:js/xpconnect/tests/unit/xpcshell.ini]
-[include:modules/libjar/zipwriter/test/unit/xpcshell.ini]
-[include:modules/libmar/tests/unit/xpcshell.ini]
-[include:modules/libpref/test/unit/xpcshell.ini]
-[include:netwerk/cookie/test/unit/xpcshell.ini]
-[include:netwerk/test/httpserver/test/xpcshell.ini]
-[include:netwerk/test/unit/xpcshell.ini]
-[include:parser/xml/test/unit/xpcshell.ini]
-[include:rdf/tests/unit/xpcshell.ini]
-[include:security/manager/ssl/tests/unit/xpcshell.ini]
-[include:services/common/tests/unit/xpcshell.ini]
-[include:services/crypto/component/tests/unit/xpcshell.ini]
-[include:services/crypto/tests/unit/xpcshell.ini]
-[include:services/sync/tests/unit/xpcshell.ini]
-[include:storage/test/unit/xpcshell.ini]
-[include:testing/xpcshell/example/unit/xpcshell.ini]
-[include:toolkit/components/autocomplete/tests/unit/xpcshell.ini]
-[include:toolkit/components/contentprefs/tests/unit/xpcshell.ini]
-[include:toolkit/components/downloads/test/schema_migration/xpcshell.ini]
-[include:toolkit/components/osfile/tests/xpcshell/xpcshell.ini]
-[include:toolkit/components/telemetry/tests/unit/xpcshell.ini]
-[include:toolkit/content/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/discovery/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/qrcode/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]
-[include:toolkit/identity/tests/unit/xpcshell.ini]
-[include:toolkit/mozapps/update/tests/xpcshell.ini]
-[include:uriloader/exthandler/tests/unit/xpcshell.ini]
-[include:xpcom/tests/unit/xpcshell.ini]
-[include:widget/tests/unit/xpcshell.ini]
deleted file mode 100644
--- a/testing/xpcshell/xpcshell_b2g.ini
+++ /dev/null
@@ -1,31 +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/.
-
-[DEFAULT]
-# Bug 1059405 - This is an odious hack to deal yet-to-be understood
-# test slowdowns from the MSG refactor (bug 848954). This should be
-# removed as soon as possible.
-requesttimeoutfactor = 2
-
-[include:dom/apps/tests/unit/xpcshell.ini]
-[include:dom/mobilemessage/tests/xpcshell/xpcshell.ini]
-[include:dom/network/tests/unit_stats/xpcshell.ini]
-[include:dom/resourcestats/tests/xpcshell/xpcshell.ini]
-[include:dom/system/gonk/tests/xpcshell.ini]
-[include:dom/wappush/tests/xpcshell.ini]
-[include:toolkit/components/osfile/tests/xpcshell/xpcshell.ini]
-[include:toolkit/components/captivedetect/test/unit/xpcshell.ini]
-[include:toolkit/devtools/apps/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/debugger/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/qrcode/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/sourcemap/tests/unit/xpcshell.ini]
-[include:toolkit/mozapps/downloads/tests/unit/xpcshell.ini]
-[include:toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini]
-[include:toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini]
-[include:toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini]
-[include:ipc/testshell/tests/xpcshell.ini]
-[include:b2g/components/test/unit/xpcshell.ini]
-[include:security/manager/ssl/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/discovery/tests/unit/xpcshell.ini]
-[include:toolkit/devtools/security/tests/unit/xpcshell.ini]
--- a/toolkit/components/autocomplete/tests/unit/xpcshell.ini
+++ b/toolkit/components/autocomplete/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [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,9 +1,10 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 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,5 +1,6 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_bug410156.js]
--- a/toolkit/components/contentprefs/tests/unit/xpcshell.ini
+++ b/toolkit/components/contentprefs/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [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,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 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,7 +1,8 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [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,10 +1,11 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [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/unit/xpcshell.ini
+++ b/toolkit/components/ctypes/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [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,13 @@
 [DEFAULT]
 head = head_download_manager.js
 tail = tail_download_manager.js
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   downloads_manifest.js
   test_downloads.manifest
   data/digest.chunk
   data/block_digest.chunk
   data/signed_win.exe
 
 [test_app_rep.js]
--- a/toolkit/components/feeds/test/xpcshell.ini
+++ b/toolkit/components/feeds/test/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 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,6 +1,7 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_filecomplete.js]
 run-if = os == 'linux'
--- a/toolkit/components/formautofill/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/formautofill/test/xpcshell/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = loader.js head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 # 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,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 # 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
   tail.js
 
 [test_DownloadCore.js]
--- a/toolkit/components/mediasniffer/test/unit/xpcshell.ini
+++ b/toolkit/components/mediasniffer/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/detodos.mp3
   data/ff-inst.exe
   data/file.mkv
   data/file.webm
   data/fl10.mp2
   data/he_free.mp3
   data/id3tags.mp3
--- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,13 @@
 [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_osfile_async.js]
--- a/toolkit/components/passwordmgr/test/unit/xpcshell.ini
+++ b/toolkit/components/passwordmgr/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || 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"
 
--- a/toolkit/components/places/tests/autocomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/autocomplete/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head_autocomplete.js
 tail = 
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_416211.js]
 [test_416214.js]
 [test_417798.js]
 [test_418257.js]
 [test_422277.js]
 [test_autocomplete_on_value_removed_479089.js]
 # Bug 676989: test fails consistently on Android
--- a/toolkit/components/places/tests/bookmarks/xpcshell.ini
+++ b/toolkit/components/places/tests/bookmarks/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_384228.js]
 [test_385829.js]
 [test_388695.js]
 [test_393498.js]
 [test_395101.js]
 [test_395593.js]
 [test_405938_restore_queries.js]
@@ -29,9 +30,9 @@ tail =
 [test_711914.js]
 [test_protectRoots.js]
 [test_818593-store-backup-metadata.js]
 [test_818584-discard-duplicate-backups.js]
 [test_818587_compress-bookmarks-backups.js]
 [test_992901-backup-unsorted-hierarchy.js]
 [test_997030-bookmarks-html-encode.js]
 [test_1016953-renaming-uncompressed.js]
-[test_1017502-bookmarks_foreign_count.js]
\ No newline at end of file
+[test_1017502-bookmarks_foreign_count.js]
--- a/toolkit/components/places/tests/expiration/xpcshell.ini
+++ b/toolkit/components/places/tests/expiration/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_expiration.js
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [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,11 +1,12 @@
 [DEFAULT]
 head = head_favicons.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   expected-favicon-big16.ico.png
   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
--- a/toolkit/components/places/tests/inline/xpcshell.ini
+++ b/toolkit/components/places/tests/inline/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_autocomplete.js
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_autocomplete_functional.js]
 [test_casing.js]
 [test_do_not_trim.js]
 [test_keywords.js]
 [test_queryurl.js]
 [test_trimming.js]
 [test_typed.js]
--- a/toolkit/components/places/tests/migration/xpcshell.ini
+++ b/toolkit/components/places/tests/migration/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_migration.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   places_alpha.sqlite
   places_v10.sqlite
   places_v10_from_v14.sqlite
   places_v19.sqlite
   places_v6_no_frecency.sqlite
   places_v6_no_indices.sqlite
 
--- a/toolkit/components/places/tests/network/xpcshell.ini
+++ b/toolkit/components/places/tests/network/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = head_network.js
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_history_redirects.js]
--- a/toolkit/components/places/tests/queries/xpcshell.ini
+++ b/toolkit/components/places/tests/queries/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_queries.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_415716.js]
 [test_abstime-annotation-domain.js]
 [test_abstime-annotation-uri.js]
 [test_async.js]
 [test_containersQueries_sorting.js]
 [test_excludeReadOnlyFolders.js]
 [test_history_queries_tags_liveUpdate.js]
--- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_autocomplete.js
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_416211.js]
 [test_416214.js]
 [test_417798.js]
 [test_418257.js]
 [test_422277.js]
 [test_autocomplete_functional.js]
 [test_autocomplete_on_value_removed_479089.js]
--- a/toolkit/components/places/tests/unit/xpcshell.ini
+++ b/toolkit/components/places/tests/unit/xpcshell.ini
@@ -1,12 +1,13 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   bookmarks.corrupt.html
   bookmarks.json
   bookmarks.preplaces.html
   bookmarks_html_singleframe.html
   bug476292.sqlite
   default.sqlite
   nsDummyObserver.js
--- a/toolkit/components/satchel/test/unit/xpcshell.ini
+++ b/toolkit/components/satchel/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_satchel.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 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,12 +1,13 @@
 [DEFAULT]
 head = head_search.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/chrome.manifest
   data/engine.src
   data/engine.xml
   data/engine2.xml
   data/engine-fr.xml
   data/engineMaker.sjs
   data/engine-rel-searchform.xml
--- a/toolkit/components/social/test/xpcshell/xpcshell.ini
+++ b/toolkit/components/social/test/xpcshell/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files = blocklist.xml
 
 [test_SocialService.js]
 
 [test_SocialServiceMigration21.js]
 
 [test_SocialServiceMigration22.js]
 
--- a/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/worker_sqlite_shared.js
   data/worker_sqlite_internal.js
   data/chrome.manifest
 
-[test_sqlite_internal.js]
\ No newline at end of file
+[test_sqlite_internal.js]
--- a/toolkit/components/startup/tests/unit/xpcshell.ini
+++ b/toolkit/components/startup/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = head_startup.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_startup_crash.js]
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head.js
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_nsITelemetry.js]
 [test_TelemetryLateWrites.js]
 [test_TelemetryLockCount.js]
 [test_TelemetryLog.js]
 [test_TelemetryPing.js]
 # Bug 676989: test fails consistently on Android
 # fail-if = os == "android"
--- a/toolkit/components/url-classifier/tests/unit/xpcshell.ini
+++ b/toolkit/components/url-classifier/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_urlclassifier.js
 tail = tail_urlclassifier.js
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/digest1.chunk
   data/digest2.chunk
 
 [test_addsub.js]
 [test_backoff.js]
 [test_dbservice.js]
 [test_hashcompleter.js]
--- a/toolkit/components/urlformatter/tests/unit/xpcshell.ini
+++ b/toolkit/components/urlformatter/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = head_urlformatter.js
 tail = 
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_urlformatter.js]
--- a/toolkit/components/workerlz4/tests/xpcshell/xpcshell.ini
+++ b/toolkit/components/workerlz4/tests/xpcshell/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   data/worker_lz4.js
   data/chrome.manifest
   data/compression.lz
 
 [test_lz4.js]
--- 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'
 support-files =
   localstore.rdf
 
 [test_XULStore.js]
--- a/toolkit/content/tests/unit/xpcshell.ini
+++ b/toolkit/content/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_contentAreaUtils.js]
 [test_updateChannelModule.js]
--- a/toolkit/crashreporter/test/unit/xpcshell.ini
+++ b/toolkit/crashreporter/test/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_crashreporter.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 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,5 +1,6 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_content_annotation.js]
--- a/toolkit/devtools/acorn/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/acorn/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = head_acorn.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_import_acorn.js]
 [test_same_ast.js]
 [test_lenient_parser.js]
--- a/toolkit/devtools/apps/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/apps/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = head_apps.js
 tail = tail_apps.js
+skip-if = toolkit == 'android'
 support-files = data/app.zip
 
 [test_webappsActor.js]
 skip-if = buildapp == "b2g"
--- a/toolkit/devtools/jsbeautify/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/jsbeautify/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = head_jsbeautify.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test.js]
--- a/toolkit/devtools/pretty-fast/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/pretty-fast/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = head_pretty-fast.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test.js]
--- a/toolkit/devtools/security/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/security/tests/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android'
 
 [test_cert.js]
--- a/toolkit/devtools/server/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/server/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_dbg.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 support-files =
   source-map-data/sourcemapped.coffee
   source-map-data/sourcemapped.map
   post_init_global_actors.js
   post_init_tab_actors.js
   pre_init_global_actors.js
   pre_init_tab_actors.js
--- a/toolkit/devtools/tern/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/tern/tests/unit/xpcshell.ini
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head_tern.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_autocompletion.js]
 [test_import_tern.js]
--- a/toolkit/devtools/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_devtools.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_independent_loaders.js]
 [test_invisible_loader.js]
 [test_safeErrorString.js]
 [test_defineLazyPrototypeGetter.js]
 [test_async-utils.js]
 [test_consoleID.js]
-[test_require_lazy.js]
\ No newline at end of file
+[test_require_lazy.js]
--- a/toolkit/devtools/transport/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/transport/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_dbg.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 support-files =
   testactors.js
   testactors-no-bulk.js
 
 [test_bulk_error.js]
 [test_client_server_bulk.js]
 [test_dbgsocket.js]
--- a/toolkit/devtools/webconsole/test/unit/xpcshell.ini
+++ b/toolkit/devtools/webconsole/test/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
 
 [test_js_property_provider.js]
 [test_network_helper.js]
--- a/toolkit/forgetaboutsite/test/unit/xpcshell.ini
+++ b/toolkit/forgetaboutsite/test/unit/xpcshell.ini
@@ -1,5 +1,6 @@
 [DEFAULT]
 head = head_forgetaboutsite.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_removeDataFromDomain.js]
--- a/toolkit/identity/tests/unit/xpcshell.ini
+++ b/toolkit/identity/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_identity.js
 tail = tail_identity.js
+skip-if = toolkit == 'gonk'
 support-files =
   data/idp_1/.well-known/browserid
   data/idp_invalid_1/.well-known/browserid
 
 # Test load modules first so syntax failures are caught early.
 [test_load_modules.js]
 [test_minimalidentity.js]
 [test_firefox_accounts.js]
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head =
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 support-files =
   propertyLists/bug710259_propertyListBinary.plist
   propertyLists/bug710259_propertyListXML.plist
   chromeappsstore.sqlite
   zips/zen.zip
 
 [test_AsyncShutdown.js]
 [test_BinarySearch.js]
--- a/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
+++ b/toolkit/mozapps/downloads/tests/unit/xpcshell.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
 head = head_downloads.js
 tail = 
+skip-if = toolkit == 'android'
 
 [test_DownloadPaths.js]
 [test_DownloadUtils.js]
 [test_lowMinutes.js]
 [test_syncedDownloadUtils.js]
 [test_unspecified_arguments.js]
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini
@@ -1,9 +1,12 @@
 # The file is shared between the two main xpcshell manifest files.
+[DEFAULT]
+skip-if = toolkit == 'android' || toolkit == 'gonk'
+
 [test_AddonRepository.js]
 # Bug 676992: test consistently hangs on Android
 skip-if = os == "android"
 [test_AddonRepository_cache.js]
 # Bug 676992: test consistently hangs on Android
 # Bug 1026805: frequent hangs on OSX 10.8
 skip-if = os == "android" || os == "mac"
 run-sequentially = Uses hardcoded ports in xpi files.
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini
@@ -1,7 +1,8 @@
  [DEFAULT]
 head = head_addons.js head_unpack.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 dupe-manifest =
 
 [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'
+skip-if = buildapp == 'mulet' || toolkit == 'android' || toolkit == 'gonk'
 head = head_addons.js
 tail =
 firefox-appdir = browser
 dupe-manifest =
 support-files =
   data/**
   xpcshell-shared.ini
 
--- a/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini
@@ -1,15 +1,16 @@
 ; 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]
 head = head_update.js
 tail =
+skip-if = toolkit == 'android'
 generated-files = head_update.js
 
 [canCheckForAndCanApplyUpdates.js]
 [urlConstruction.js]
 [updateCheckOnLoadOnErrorStatusText.js]
 [updateManagerXML.js]
 [remoteUpdateXML.js]
 [downloadAndHashCheckMar.js]
--- a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini
@@ -4,16 +4,17 @@
 
 ; Tests that require the updater binary. These tests should never run on Android
 ; which doesn't use the updater binary as other applications do and are excluded
 ; from running the tests in the moz.build file.
 
 [DEFAULT]
 head = head_update.js
 tail =
+skip-if = toolkit == 'android'
 generated-files = head_update.js
 
 [marSuccessComplete.js]
 [marSuccessPartial.js]
 [marFailurePartial.js]
 [marStageSuccessComplete.js]
 skip-if = toolkit == 'gonk'
 reason = bug 820380
--- a/toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini
+++ b/toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini
@@ -1,11 +1,12 @@
 ; 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]
 head = 
 tail = 
+skip-if = toolkit == 'android'
 
 [consumerNotifications.js]
 # Bug 676992: test consistently fails on Android
 fail-if = os == "android"
--- a/tools/profiler/tests/xpcshell.ini
+++ b/tools/profiler/tests/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_profiler.js
 tail =
+skip-if = toolkit == 'android' || toolkit == 'gonk'
 
 [test_start.js]
 skip-if = true
 [test_get_features.js]
 [test_shared_library.js]
 [test_run.js]
 skip-if = true
 [test_pause.js]
--- a/uriloader/exthandler/tests/unit/xpcshell.ini
+++ b/uriloader/exthandler/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_handlerService.js
 tail = tail_handlerService.js
+skip-if = toolkit == 'gonk'
 run-sequentially = Bug 912235 - Intermittent failures
 
 [test_getTypeFromExtension_ext_to_type_mapping.js]
 [test_getTypeFromExtension_with_empty_Content_Type.js]
 [test_handlerService.js]
 support-files = mailcap
 # Bug 676997: test consistently fails on Android
 fail-if = os == "android"
--- a/widget/tests/unit/xpcshell.ini
+++ b/widget/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
 head = 
 tail = 
+skip-if = toolkit == 'gonk'
 
 [test_taskbar_jumplistitems.js]
 [test_macwebapputils.js]
 skip-if = os != "mac"
--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -1,11 +1,12 @@
 [DEFAULT]
 head = head_xpcom.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files =
   bug725015.manifest
   compmgr_warnings.manifest
   data/**
 
 [test_bug121341.js]
 [test_bug325418.js]
 [test_bug332389.js]