From 903d0256a3b6290b7454e539ea4ca245406d807b Mon Sep 17 00:00:00 2001 From: Andrew Halberstadt Date: Tue, 7 Oct 2014 18:18:28 -0400 Subject: [PATCH] Bug 1066735 - Remove root b2g and android specific xpcshell manifests, r=chmanchester --- .../dirprovider/tests/unit/xpcshell.ini | 1 + .../downloads/test/unit/xpcshell.ini | 1 + .../components/feeds/test/unit/xpcshell.ini | 1 + .../loop/test/xpcshell/xpcshell.ini | 1 + .../migration/tests/unit/xpcshell.ini | 1 + .../components/places/tests/unit/xpcshell.ini | 1 + .../sessionstore/test/unit/xpcshell.ini | 1 + .../components/shell/test/unit/xpcshell.ini | 1 + .../translation/test/unit/xpcshell.ini | 1 + .../devtools/shared/test/unit/xpcshell.ini | 1 + .../styleinspector/test/unit/xpcshell.ini | 1 + .../experiments/test/xpcshell/xpcshell.ini | 1 + browser/modules/test/unit/social/xpcshell.ini | 1 + browser/modules/test/xpcshell/xpcshell.ini | 1 + chrome/test/unit/xpcshell.ini | 1 + chrome/test/unit_ipc/xpcshell.ini | 1 + content/base/test/unit/xpcshell.ini | 1 + content/base/test/unit_ipc/xpcshell.ini | 1 + content/test/unit/xpcshell.ini | 1 + docshell/test/unit/xpcshell.ini | 1 + docshell/test/unit_ipc/xpcshell.ini | 1 + dom/activities/tests/unit/xpcshell.ini | 1 + dom/encoding/test/unit/xpcshell.ini | 1 + .../test/unit/xpcshell-child-process.ini | 1 + .../test/unit/xpcshell-parent-process.ini | 1 + dom/indexedDB/test/unit/xpcshell-shared.ini | 2 + dom/json/test/unit/xpcshell.ini | 1 + dom/network/tests/unit/xpcshell.ini | 1 + dom/network/tests/unit_ipc/xpcshell.ini | 1 + dom/notification/test/unit/xpcshell.ini | 1 + dom/payment/tests/unit/xpcshell.ini | 1 + dom/permission/tests/unit/xpcshell.ini | 1 + dom/plugins/test/unit/xpcshell.ini | 2 +- dom/tests/unit/xpcshell.ini | 1 + dom/workers/test/xpcshell/xpcshell.ini | 1 + embedding/tests/unit/xpcshell.ini | 1 + extensions/cookie/test/unit/xpcshell.ini | 1 + extensions/cookie/test/unit_ipc/xpcshell.ini | 1 + .../hunspell/tests/unit/xpcshell.ini | 1 + gfx/tests/unit/xpcshell.ini | 1 + image/test/unit/xpcshell.ini | 1 + intl/locale/tests/unit/xpcshell.ini | 1 + intl/strres/tests/unit/xpcshell.ini | 1 + intl/uconv/tests/unit/xpcshell.ini | 1 + intl/unicharutil/tests/unit/xpcshell.ini | 1 + ipc/testshell/tests/xpcshell.ini | 1 + js/ductwork/debugger/tests/xpcshell.ini | 1 + js/xpconnect/tests/unit/xpcshell.ini | 1 + modules/libjar/test/unit/xpcshell.ini | 1 + .../libjar/zipwriter/test/unit/xpcshell.ini | 1 + modules/libmar/tests/unit/xpcshell.ini | 1 + modules/libpref/test/unit/xpcshell.ini | 1 + modules/libpref/test/unit_ipc/xpcshell.ini | 1 + netwerk/cookie/test/unit/xpcshell.ini | 1 + netwerk/cookie/test/unit_ipc/xpcshell.ini | 1 + netwerk/test/httpserver/test/xpcshell.ini | 1 + netwerk/test/unit/xpcshell.ini | 1 + netwerk/test/unit_ipc/xpcshell.ini | 1 + parser/xml/test/unit/xpcshell.ini | 1 + rdf/tests/unit/xpcshell.ini | 1 + .../ssl/tests/unit/xpcshell-smartcards.ini | 1 + security/manager/ssl/tests/unit/xpcshell.ini | 2 +- .../cloudsync/tests/xpcshell/xpcshell.ini | 1 + services/common/tests/unit/xpcshell.ini | 1 + .../crypto/component/tests/unit/xpcshell.ini | 1 + services/crypto/tests/unit/xpcshell.ini | 1 + .../datareporting/tests/xpcshell/xpcshell.ini | 1 + .../fxaccounts/tests/xpcshell/xpcshell.ini | 2 + .../healthreport/tests/xpcshell/xpcshell.ini | 1 + services/metrics/tests/xpcshell/xpcshell.ini | 1 + services/mobileid/tests/xpcshell/xpcshell.ini | 1 + services/sync/tests/unit/xpcshell.ini | 1 + storage/test/unit/xpcshell.ini | 1 + .../config/mozharness/android_arm_config.py | 2 +- .../config/mozharness/android_panda_config.py | 2 +- .../config/mozharness/android_x86_config.py | 2 +- .../config/mozharness/b2g_emulator_config.py | 2 +- testing/modules/tests/xpcshell/xpcshell.ini | 1 + testing/xpcshell/Makefile.in | 2 - testing/xpcshell/example/unit/xpcshell.ini | 1 + testing/xpcshell/mach_commands.py | 4 +- testing/xpcshell/xpcshell_android.ini | 58 ------------------- testing/xpcshell/xpcshell_b2g.ini | 33 ----------- .../asyncshutdown/tests/xpcshell/xpcshell.ini | 1 + .../autocomplete/tests/unit/xpcshell.ini | 1 + .../commandlines/test/unit/xpcshell.ini | 1 + .../commandlines/test/unit_unix/xpcshell.ini | 1 + .../contentprefs/tests/unit/xpcshell.ini | 1 + .../contentprefs/tests/unit_cps2/xpcshell.ini | 1 + .../crashes/tests/xpcshell/xpcshell.ini | 1 + .../crashmonitor/test/unit/xpcshell.ini | 1 + .../components/ctypes/tests/unit/xpcshell.ini | 1 + .../downloads/test/unit/xpcshell.ini | 1 + toolkit/components/feeds/test/xpcshell.ini | 1 + .../filepicker/test/unit/xpcshell.ini | 1 + .../filewatcher/tests/xpcshell/xpcshell.ini | 2 +- .../formautofill/test/xpcshell/xpcshell.ini | 1 + .../jsdownloads/test/unit/xpcshell.ini | 1 + .../mediasniffer/test/unit/xpcshell.ini | 1 + .../osfile/tests/xpcshell/xpcshell.ini | 2 + .../passwordmgr/test/unit/xpcshell.ini | 1 + .../places/tests/autocomplete/xpcshell.ini | 1 + .../places/tests/bookmarks/xpcshell.ini | 3 +- .../places/tests/expiration/xpcshell.ini | 1 + .../places/tests/favicons/xpcshell.ini | 1 + .../places/tests/inline/xpcshell.ini | 1 + .../places/tests/migration/xpcshell.ini | 1 + .../places/tests/network/xpcshell.ini | 1 + .../places/tests/queries/xpcshell.ini | 1 + .../places/tests/unifiedcomplete/xpcshell.ini | 1 + .../components/places/tests/unit/xpcshell.ini | 1 + .../promiseworker/tests/xpcshell/xpcshell.ini | 1 + .../components/satchel/test/unit/xpcshell.ini | 1 + .../search/tests/xpcshell/xpcshell.ini | 1 + .../social/test/xpcshell/xpcshell.ini | 1 + .../sqlite/tests/xpcshell/xpcshell.ini | 3 +- .../startup/tests/unit/xpcshell.ini | 1 + .../telemetry/tests/unit/xpcshell.ini | 1 + .../url-classifier/tests/unit/xpcshell.ini | 1 + .../urlformatter/tests/unit/xpcshell.ini | 1 + .../workerlz4/tests/xpcshell/xpcshell.ini | 1 + .../xulstore/tests/xpcshell/xpcshell.ini | 2 +- toolkit/content/tests/unit/xpcshell.ini | 1 + toolkit/crashreporter/test/unit/xpcshell.ini | 1 + .../crashreporter/test/unit_ipc/xpcshell.ini | 1 + .../devtools/acorn/tests/unit/xpcshell.ini | 1 + toolkit/devtools/apps/tests/unit/xpcshell.ini | 1 + .../jsbeautify/tests/unit/xpcshell.ini | 1 + .../pretty-fast/tests/unit/xpcshell.ini | 1 + .../devtools/security/tests/unit/xpcshell.ini | 1 + .../devtools/server/tests/unit/xpcshell.ini | 1 + toolkit/devtools/tern/tests/unit/xpcshell.ini | 1 + toolkit/devtools/tests/unit/xpcshell.ini | 3 +- .../transport/tests/unit/xpcshell.ini | 1 + .../webconsole/test/unit/xpcshell.ini | 1 + .../forgetaboutsite/test/unit/xpcshell.ini | 1 + toolkit/identity/tests/unit/xpcshell.ini | 1 + toolkit/modules/tests/xpcshell/xpcshell.ini | 1 + .../mozapps/downloads/tests/unit/xpcshell.ini | 1 + .../test/xpcshell/xpcshell-shared.ini | 3 + .../test/xpcshell/xpcshell-unpack.ini | 1 + .../extensions/test/xpcshell/xpcshell.ini | 2 +- .../update/tests/unit_aus_update/xpcshell.ini | 1 + .../tests/unit_base_updater/xpcshell.ini | 1 + .../tests/unit_timermanager/xpcshell.ini | 1 + tools/profiler/tests/xpcshell.ini | 1 + uriloader/exthandler/tests/unit/xpcshell.ini | 1 + widget/tests/unit/xpcshell.ini | 1 + xpcom/tests/unit/xpcshell.ini | 1 + 149 files changed, 155 insertions(+), 107 deletions(-) delete mode 100644 testing/xpcshell/xpcshell_android.ini delete mode 100644 testing/xpcshell/xpcshell_b2g.ini diff --git a/browser/components/dirprovider/tests/unit/xpcshell.ini b/browser/components/dirprovider/tests/unit/xpcshell.ini index 27afed6507b43..e1504bb70d9fc 100644 --- a/browser/components/dirprovider/tests/unit/xpcshell.ini +++ b/browser/components/dirprovider/tests/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = head_dirprovider.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_bookmark_pref.js] [test_keys.js] diff --git a/browser/components/downloads/test/unit/xpcshell.ini b/browser/components/downloads/test/unit/xpcshell.ini index 924123c74223b..787c35cc10e29 100644 --- a/browser/components/downloads/test/unit/xpcshell.ini +++ b/browser/components/downloads/test/unit/xpcshell.ini @@ -2,5 +2,6 @@ head = head.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_DownloadsCommon.js] diff --git a/browser/components/feeds/test/unit/xpcshell.ini b/browser/components/feeds/test/unit/xpcshell.ini index abe7868975067..fc88e1473adec 100644 --- a/browser/components/feeds/test/unit/xpcshell.ini +++ b/browser/components/feeds/test/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = head_feeds.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_355473.js] [test_758990.js] diff --git a/browser/components/loop/test/xpcshell/xpcshell.ini b/browser/components/loop/test/xpcshell/xpcshell.ini index ecd81685f49e7..bc55744945ed8 100644 --- a/browser/components/loop/test/xpcshell/xpcshell.ini +++ b/browser/components/loop/test/xpcshell/xpcshell.ini @@ -2,6 +2,7 @@ head = head.js tail = firefox-appdir = browser +skip-if = toolkit == 'gonk' [test_loopapi_hawk_request.js] [test_looppush_initialize.js] diff --git a/browser/components/migration/tests/unit/xpcshell.ini b/browser/components/migration/tests/unit/xpcshell.ini index c08c2533f0fc3..e5c9190bd170e 100644 --- a/browser/components/migration/tests/unit/xpcshell.ini +++ b/browser/components/migration/tests/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = head_migration.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_IE_bookmarks.js] skip-if = os != "win" diff --git a/browser/components/places/tests/unit/xpcshell.ini b/browser/components/places/tests/unit/xpcshell.ini index 079be73f5a73d..d08473e2ea3bd 100644 --- a/browser/components/places/tests/unit/xpcshell.ini +++ b/browser/components/places/tests/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = head_bookmarks.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = bookmarks.glue.html bookmarks.glue.json diff --git a/browser/components/sessionstore/test/unit/xpcshell.ini b/browser/components/sessionstore/test/unit/xpcshell.ini index 21ab8440e480c..124952d730363 100644 --- a/browser/components/sessionstore/test/unit/xpcshell.ini +++ b/browser/components/sessionstore/test/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = head.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/sessionCheckpoints_all.json data/sessionstore_invalid.js diff --git a/browser/components/shell/test/unit/xpcshell.ini b/browser/components/shell/test/unit/xpcshell.ini index 33804fd42179b..16dd5a6bdafde 100644 --- a/browser/components/shell/test/unit/xpcshell.ini +++ b/browser/components/shell/test/unit/xpcshell.ini @@ -2,5 +2,6 @@ head = tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_421977.js] diff --git a/browser/components/translation/test/unit/xpcshell.ini b/browser/components/translation/test/unit/xpcshell.ini index 6a97124ef7c35..a8c877b96da84 100644 --- a/browser/components/translation/test/unit/xpcshell.ini +++ b/browser/components/translation/test/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_cld2.js] [test_healthreport.js] diff --git a/browser/devtools/shared/test/unit/xpcshell.ini b/browser/devtools/shared/test/unit/xpcshell.ini index 887c272736443..9326fe5cd6184 100644 --- a/browser/devtools/shared/test/unit/xpcshell.ini +++ b/browser/devtools/shared/test/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_bezierCanvas.js] [test_cubicBezier.js] diff --git a/browser/devtools/styleinspector/test/unit/xpcshell.ini b/browser/devtools/styleinspector/test/unit/xpcshell.ini index c3454f981bd18..90b0c5d9cbe10 100644 --- a/browser/devtools/styleinspector/test/unit/xpcshell.ini +++ b/browser/devtools/styleinspector/test/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_parseDeclarations.js] [test_parseSingleValue.js] diff --git a/browser/experiments/test/xpcshell/xpcshell.ini b/browser/experiments/test/xpcshell/xpcshell.ini index 644cbabe5c73f..f9d7dca88e091 100644 --- a/browser/experiments/test/xpcshell/xpcshell.ini +++ b/browser/experiments/test/xpcshell/xpcshell.ini @@ -2,6 +2,7 @@ head = head.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = experiments_1.manifest experiment-1.xpi diff --git a/browser/modules/test/unit/social/xpcshell.ini b/browser/modules/test/unit/social/xpcshell.ini index 7a20059e23bec..55e708eb164d3 100644 --- a/browser/modules/test/unit/social/xpcshell.ini +++ b/browser/modules/test/unit/social/xpcshell.ini @@ -2,6 +2,7 @@ head = head.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = blocklist.xml [test_social.js] diff --git a/browser/modules/test/xpcshell/xpcshell.ini b/browser/modules/test/xpcshell/xpcshell.ini index 7319b3ffd9e49..4bb31a385c52b 100644 --- a/browser/modules/test/xpcshell/xpcshell.ini +++ b/browser/modules/test/xpcshell/xpcshell.ini @@ -2,5 +2,6 @@ head = tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_DirectoryLinksProvider.js] diff --git a/chrome/test/unit/xpcshell.ini b/chrome/test/unit/xpcshell.ini index 676f36ae8f6fa..8a11d762632c9 100644 --- a/chrome/test/unit/xpcshell.ini +++ b/chrome/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_crtestutils.js tail = +skip-if = toolkit == 'gonk' support-files = data/** [test_abi.js] diff --git a/chrome/test/unit_ipc/xpcshell.ini b/chrome/test/unit_ipc/xpcshell.ini index 113f720a449f5..5fed166035bfc 100644 --- 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] diff --git a/content/base/test/unit/xpcshell.ini b/content/base/test/unit/xpcshell.ini index 0f444ac197fd8..3d913b0b339e2 100644 --- a/content/base/test/unit/xpcshell.ini +++ b/content/base/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_utilities.js tail = +skip-if = toolkit == 'gonk' support-files = 1_original.xml 1_result.xml diff --git a/content/base/test/unit_ipc/xpcshell.ini b/content/base/test/unit_ipc/xpcshell.ini index 4911e99a993bf..d8e0d38f65e4f 100644 --- 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] diff --git a/content/test/unit/xpcshell.ini b/content/test/unit/xpcshell.ini index 6101c1de494e2..bbaf428021657 100644 --- a/content/test/unit/xpcshell.ini +++ b/content/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_content.js tail = +skip-if = toolkit == 'gonk' support-files = empty_document.xml isequalnode_data.xml diff --git a/docshell/test/unit/xpcshell.ini b/docshell/test/unit/xpcshell.ini index c1b72352848a1..106f20f7e9d9f 100644 --- a/docshell/test/unit/xpcshell.ini +++ b/docshell/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_docshell.js tail = +skip-if = toolkit == 'gonk' [test_bug414201_jfif.js] [test_bug442584.js] diff --git a/docshell/test/unit_ipc/xpcshell.ini b/docshell/test/unit_ipc/xpcshell.ini index 38fba24742795..1df055a606d6a 100644 --- a/docshell/test/unit_ipc/xpcshell.ini +++ b/docshell/test/unit_ipc/xpcshell.ini @@ -1,6 +1,7 @@ [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 diff --git a/dom/activities/tests/unit/xpcshell.ini b/dom/activities/tests/unit/xpcshell.ini index d7aeee7af952a..6892190ab4391 100644 --- 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] diff --git a/dom/encoding/test/unit/xpcshell.ini b/dom/encoding/test/unit/xpcshell.ini index 7ca8b584dcd23..588926c0a7e59 100644 --- a/dom/encoding/test/unit/xpcshell.ini +++ b/dom/encoding/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'gonk' [test_misc.js] [test_utf.js] diff --git a/dom/indexedDB/test/unit/xpcshell-child-process.ini b/dom/indexedDB/test/unit/xpcshell-child-process.ini index d9a7b7589c9e6..970fe8c3ddd6d 100644 --- a/dom/indexedDB/test/unit/xpcshell-child-process.ini +++ b/dom/indexedDB/test/unit/xpcshell-child-process.ini @@ -6,6 +6,7 @@ dupe-manifest = head = xpcshell-head-child-process.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = GlobalObjectsChild.js GlobalObjectsComponent.js diff --git a/dom/indexedDB/test/unit/xpcshell-parent-process.ini b/dom/indexedDB/test/unit/xpcshell-parent-process.ini index cb7dc0e2eb963..97ddd8f109562 100644 --- a/dom/indexedDB/test/unit/xpcshell-parent-process.ini +++ b/dom/indexedDB/test/unit/xpcshell-parent-process.ini @@ -6,6 +6,7 @@ dupe-manifest = head = xpcshell-head-parent-process.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = GlobalObjectsChild.js GlobalObjectsComponent.js diff --git a/dom/indexedDB/test/unit/xpcshell-shared.ini b/dom/indexedDB/test/unit/xpcshell-shared.ini index 75ea49ade3838..39f78fdea9e93 100644 --- a/dom/indexedDB/test/unit/xpcshell-shared.ini +++ b/dom/indexedDB/test/unit/xpcshell-shared.ini @@ -1,6 +1,8 @@ # 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] +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_add_put.js] [test_add_twice_failure.js] diff --git a/dom/json/test/unit/xpcshell.ini b/dom/json/test/unit/xpcshell.ini index ba3491418ab1b..e28785d2d9f28 100644 --- a/dom/json/test/unit/xpcshell.ini +++ b/dom/json/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' support-files = decodeFromStream-01.json decodeFromStream-small.json diff --git a/dom/network/tests/unit/xpcshell.ini b/dom/network/tests/unit/xpcshell.ini index 44ffdfcab8b55..521321563d261 100644 --- a/dom/network/tests/unit/xpcshell.ini +++ b/dom/network/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' [test_tcpsocket.js] [test_multisend.js] diff --git a/dom/network/tests/unit_ipc/xpcshell.ini b/dom/network/tests/unit_ipc/xpcshell.ini index 1aeed23703302..a1921ba608b3e 100644 --- a/dom/network/tests/unit_ipc/xpcshell.ini +++ b/dom/network/tests/unit_ipc/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_tcpsocket_ipc.js] [test_tcpserversocket_ipc.js] diff --git a/dom/notification/test/unit/xpcshell.ini b/dom/notification/test/unit/xpcshell.ini index 6bf69169bd844..c8a6ee73b9481 100644 --- 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] diff --git a/dom/payment/tests/unit/xpcshell.ini b/dom/payment/tests/unit/xpcshell.ini index 0d3a52ed3b1fd..cc9c6bc706bbf 100644 --- 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] diff --git a/dom/permission/tests/unit/xpcshell.ini b/dom/permission/tests/unit/xpcshell.ini index 1c296a77c0c79..8e74a64ff76cf 100644 --- 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] diff --git a/dom/plugins/test/unit/xpcshell.ini b/dom/plugins/test/unit/xpcshell.ini index 2e81b4f456e58..3b5a192470839 100644 --- a/dom/plugins/test/unit/xpcshell.ini +++ b/dom/plugins/test/unit/xpcshell.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'mulet' +skip-if = buildapp == 'mulet' || toolkit == 'android' || toolkit == 'gonk' head = head_plugins.js tail = diff --git a/dom/tests/unit/xpcshell.ini b/dom/tests/unit/xpcshell.ini index 98c9dbe410a03..2654cafa71407 100644 --- a/dom/tests/unit/xpcshell.ini +++ b/dom/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' [test_bug319968.js] [test_bug465752.js] diff --git a/dom/workers/test/xpcshell/xpcshell.ini b/dom/workers/test/xpcshell/xpcshell.ini index f2869dbbd1786..f1437f9ac79b4 100644 --- a/dom/workers/test/xpcshell/xpcshell.ini +++ b/dom/workers/test/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/worker.js data/chrome.manifest diff --git a/embedding/tests/unit/xpcshell.ini b/embedding/tests/unit/xpcshell.ini index b3c55a1e7f012..4b53496d361ec 100644 --- 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] diff --git a/extensions/cookie/test/unit/xpcshell.ini b/extensions/cookie/test/unit/xpcshell.ini index 26d6d42f42dec..e9e6333d18b3d 100644 --- a/extensions/cookie/test/unit/xpcshell.ini +++ b/extensions/cookie/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_cookies.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = cookieprompt.js cookieprompt.manifest diff --git a/extensions/cookie/test/unit_ipc/xpcshell.ini b/extensions/cookie/test/unit_ipc/xpcshell.ini index ed12fade09657..ef62e57784323 100644 --- 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] diff --git a/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini b/extensions/spellcheck/hunspell/tests/unit/xpcshell.ini index 3c77191783da3..31ebf2686706f 100644 --- 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] diff --git a/gfx/tests/unit/xpcshell.ini b/gfx/tests/unit/xpcshell.ini index 1354cd0e6626a..a4e6c49e35905 100644 --- 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] diff --git a/image/test/unit/xpcshell.ini b/image/test/unit/xpcshell.ini index 1d54331413285..6dc229e03232d 100644 --- a/image/test/unit/xpcshell.ini +++ b/image/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' support-files = async_load_tests.js bug413512.ico diff --git a/intl/locale/tests/unit/xpcshell.ini b/intl/locale/tests/unit/xpcshell.ini index 9c0d69f47e693..2d5572b174a11 100644 --- a/intl/locale/tests/unit/xpcshell.ini +++ b/intl/locale/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' [test_bug22310.js] run-if = toolkit == "windows" || toolkit == "cocoa" diff --git a/intl/strres/tests/unit/xpcshell.ini b/intl/strres/tests/unit/xpcshell.ini index 63e47797d84fd..56dac6769b62c 100644 --- a/intl/strres/tests/unit/xpcshell.ini +++ b/intl/strres/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' support-files = 397093.properties strres.properties diff --git a/intl/uconv/tests/unit/xpcshell.ini b/intl/uconv/tests/unit/xpcshell.ini index 6107a05a7bbbc..1bbf53a598008 100644 --- a/intl/uconv/tests/unit/xpcshell.ini +++ b/intl/uconv/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' support-files = CharsetConversionTests.js hangulTestStrings.js diff --git a/intl/unicharutil/tests/unit/xpcshell.ini b/intl/unicharutil/tests/unit/xpcshell.ini index 673fa55572fd1..622dbcfe4138a 100644 --- 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] diff --git a/ipc/testshell/tests/xpcshell.ini b/ipc/testshell/tests/xpcshell.ini index bb0e8fa5eaddc..253f4cdea4dcd 100644 --- a/ipc/testshell/tests/xpcshell.ini +++ b/ipc/testshell/tests/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' [test_ipcshell.js] # Bug 676963: test fails consistently on Android diff --git a/js/ductwork/debugger/tests/xpcshell.ini b/js/ductwork/debugger/tests/xpcshell.ini index 64dabd238f4d5..e43113fce364c 100644 --- a/js/ductwork/debugger/tests/xpcshell.ini +++ b/js/ductwork/debugger/tests/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_dbg.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_nativewrappers.js] # Bug 685068 diff --git a/js/xpconnect/tests/unit/xpcshell.ini b/js/xpconnect/tests/unit/xpcshell.ini index 3b0d5133396ae..7032a9d57e047 100644 --- a/js/xpconnect/tests/unit/xpcshell.ini +++ b/js/xpconnect/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' support-files = CatRegistrationComponents.manifest bogus_element_type.jsm diff --git a/modules/libjar/test/unit/xpcshell.ini b/modules/libjar/test/unit/xpcshell.ini index 4a6c19373e116..72af4d9a83f29 100644 --- a/modules/libjar/test/unit/xpcshell.ini +++ b/modules/libjar/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_ipc.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/empty data/test_bug333423.zip diff --git a/modules/libjar/zipwriter/test/unit/xpcshell.ini b/modules/libjar/zipwriter/test/unit/xpcshell.ini index a0a4a3ce12e27..353e4ccaba1b9 100644 --- a/modules/libjar/zipwriter/test/unit/xpcshell.ini +++ b/modules/libjar/zipwriter/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [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 diff --git a/modules/libmar/tests/unit/xpcshell.ini b/modules/libmar/tests/unit/xpcshell.ini index f8f9a700cd768..b5d89fcf61a6f 100644 --- a/modules/libmar/tests/unit/xpcshell.ini +++ b/modules/libmar/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_libmar.js tail = +skip-if = toolkit == 'gonk' support-files = data/** [test_create.js] diff --git a/modules/libpref/test/unit/xpcshell.ini b/modules/libpref/test/unit/xpcshell.ini index 91227256cdaee..443d96e3bb41d 100644 --- a/modules/libpref/test/unit/xpcshell.ini +++ b/modules/libpref/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_libPrefs.js tail = +skip-if = toolkit == 'gonk' support-files = data/testPref.js extdata/testExt.js diff --git a/modules/libpref/test/unit_ipc/xpcshell.ini b/modules/libpref/test/unit_ipc/xpcshell.ini index 6223d2342efd2..e24b9a778e377 100644 --- a/modules/libpref/test/unit_ipc/xpcshell.ini +++ b/modules/libpref/test/unit_ipc/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_existing_prefs.js] [test_initial_prefs.js] diff --git a/netwerk/cookie/test/unit/xpcshell.ini b/netwerk/cookie/test/unit/xpcshell.ini index f51f362de70bd..40a543f6120eb 100644 --- a/netwerk/cookie/test/unit/xpcshell.ini +++ b/netwerk/cookie/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' [test_bug643051.js] [test_parser_0001.js] diff --git a/netwerk/cookie/test/unit_ipc/xpcshell.ini b/netwerk/cookie/test/unit_ipc/xpcshell.ini index 5fa2158599027..6ca62e6539c71 100644 --- 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] diff --git a/netwerk/test/httpserver/test/xpcshell.ini b/netwerk/test/httpserver/test/xpcshell.ini index 7d15887520df8..b635ad1864c44 100644 --- a/netwerk/test/httpserver/test/xpcshell.ini +++ b/netwerk/test/httpserver/test/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_utils.js tail = +skip-if = toolkit == 'gonk' support-files = data/** [test_async_response_sending.js] diff --git a/netwerk/test/unit/xpcshell.ini b/netwerk/test/unit/xpcshell.ini index 07f7ba67399bb..830c708b88b94 100644 --- a/netwerk/test/unit/xpcshell.ini +++ b/netwerk/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [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 diff --git a/netwerk/test/unit_ipc/xpcshell.ini b/netwerk/test/unit_ipc/xpcshell.ini index 61113a3380523..77715d22aecfe 100644 --- a/netwerk/test/unit_ipc/xpcshell.ini +++ b/netwerk/test/unit_ipc/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_channels_clone.js head_cc.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = disabled_test_bug528292_wrap.js child_app_offline.js diff --git a/parser/xml/test/unit/xpcshell.ini b/parser/xml/test/unit/xpcshell.ini index 78bb604d2698c..638f0527af8c6 100644 --- a/parser/xml/test/unit/xpcshell.ini +++ b/parser/xml/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' support-files = results.js [test_parser.js] diff --git a/rdf/tests/unit/xpcshell.ini b/rdf/tests/unit/xpcshell.ini index 99ab82395322f..9709b800c59bf 100644 --- 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] diff --git a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini b/security/manager/ssl/tests/unit/xpcshell-smartcards.ini index 46b4d90c86298..d9906065e4118 100644 --- a/security/manager/ssl/tests/unit/xpcshell-smartcards.ini +++ b/security/manager/ssl/tests/unit/xpcshell-smartcards.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_psm.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = [test_pkcs11_insert_remove.js] diff --git a/security/manager/ssl/tests/unit/xpcshell.ini b/security/manager/ssl/tests/unit/xpcshell.ini index e139b1dec26b3..c79302812c21e 100644 --- a/security/manager/ssl/tests/unit/xpcshell.ini +++ b/security/manager/ssl/tests/unit/xpcshell.ini @@ -25,7 +25,7 @@ support-files = [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] diff --git a/services/cloudsync/tests/xpcshell/xpcshell.ini b/services/cloudsync/tests/xpcshell/xpcshell.ini index 6b92016e39def..bb2889036bbb4 100644 --- a/services/cloudsync/tests/xpcshell/xpcshell.ini +++ b/services/cloudsync/tests/xpcshell/xpcshell.ini @@ -2,6 +2,7 @@ head = head.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_module.js] [test_tabs.js] diff --git a/services/common/tests/unit/xpcshell.ini b/services/common/tests/unit/xpcshell.ini index 9a96391b5cfbc..3010199caf28b 100644 --- a/services/common/tests/unit/xpcshell.ini +++ b/services/common/tests/unit/xpcshell.ini @@ -2,6 +2,7 @@ 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] diff --git a/services/crypto/component/tests/unit/xpcshell.ini b/services/crypto/component/tests/unit/xpcshell.ini index 83b6158882308..8d4772b283a70 100644 --- a/services/crypto/component/tests/unit/xpcshell.ini +++ b/services/crypto/component/tests/unit/xpcshell.ini @@ -2,5 +2,6 @@ head = tail = firefox-appdir = browser +skip-if = toolkit == 'gonk' [test_jpake.js] diff --git a/services/crypto/tests/unit/xpcshell.ini b/services/crypto/tests/unit/xpcshell.ini index fbc52b4e2e2fc..c2346fbde2022 100644 --- a/services/crypto/tests/unit/xpcshell.ini +++ b/services/crypto/tests/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = head_helpers.js ../../../common/tests/unit/head_helpers.js tail = firefox-appdir = browser +skip-if = toolkit == 'gonk' [test_load_modules.js] diff --git a/services/datareporting/tests/xpcshell/xpcshell.ini b/services/datareporting/tests/xpcshell/xpcshell.ini index 5b135c0cb1f7c..934227e192db3 100644 --- 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] diff --git a/services/fxaccounts/tests/xpcshell/xpcshell.ini b/services/fxaccounts/tests/xpcshell/xpcshell.ini index ded30b4e5e069..ec178f4ebfafd 100644 --- a/services/fxaccounts/tests/xpcshell/xpcshell.ini +++ b/services/fxaccounts/tests/xpcshell/xpcshell.ini @@ -1,9 +1,11 @@ [DEFAULT] head = head.js ../../../common/tests/unit/head_helpers.js ../../../common/tests/unit/head_http.js tail = +skip-if = toolkit == 'android' [test_accounts.js] [test_client.js] +skip-if = toolkit == 'gonk' && debug # times out, bug 1079405 [test_credentials.js] [test_loginmgr_storage.js] skip-if = appname == 'b2g' # login manager storage only used on desktop. diff --git a/services/healthreport/tests/xpcshell/xpcshell.ini b/services/healthreport/tests/xpcshell/xpcshell.ini index 6ef92c8161afe..d8af5ac21ba37 100644 --- a/services/healthreport/tests/xpcshell/xpcshell.ini +++ b/services/healthreport/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_load_modules.js] [test_profile.js] diff --git a/services/metrics/tests/xpcshell/xpcshell.ini b/services/metrics/tests/xpcshell/xpcshell.ini index ec5d161cb1058..9707b3de7bb0d 100644 --- a/services/metrics/tests/xpcshell/xpcshell.ini +++ b/services/metrics/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_load_modules.js] [test_metrics_provider.js] diff --git a/services/mobileid/tests/xpcshell/xpcshell.ini b/services/mobileid/tests/xpcshell/xpcshell.ini index bcc80dc3d48b8..49ee9e8526d17 100644 --- 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] diff --git a/services/sync/tests/unit/xpcshell.ini b/services/sync/tests/unit/xpcshell.ini index 72570125b34c2..89bcb9cf371d7 100644 --- a/services/sync/tests/unit/xpcshell.ini +++ b/services/sync/tests/unit/xpcshell.ini @@ -2,6 +2,7 @@ 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 diff --git a/storage/test/unit/xpcshell.ini b/storage/test/unit/xpcshell.ini index 69e4eb02b55c2..12986c5dca96b 100644 --- a/storage/test/unit/xpcshell.ini +++ b/storage/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_storage.js tail = +skip-if = toolkit == 'gonk' support-files = corruptDB.sqlite fakeDB.sqlite diff --git a/testing/config/mozharness/android_arm_config.py b/testing/config/mozharness/android_arm_config.py index d16d8cb24dbb4..053a1904d7614 100644 --- a/testing/config/mozharness/android_arm_config.py +++ b/testing/config/mozharness/android_arm_config.py @@ -32,7 +32,7 @@ "--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 diff --git a/testing/config/mozharness/android_panda_config.py b/testing/config/mozharness/android_panda_config.py index 8bc1e99ddddde..ef57e90d40b4f 100644 --- a/testing/config/mozharness/android_panda_config.py +++ b/testing/config/mozharness/android_panda_config.py @@ -55,7 +55,7 @@ "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", diff --git a/testing/config/mozharness/android_x86_config.py b/testing/config/mozharness/android_x86_config.py index 55323c22107a2..68d0b03d704a1 100644 --- a/testing/config/mozharness/android_x86_config.py +++ b/testing/config/mozharness/android_x86_config.py @@ -32,7 +32,7 @@ "--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 diff --git a/testing/config/mozharness/b2g_emulator_config.py b/testing/config/mozharness/b2g_emulator_config.py index 6976cf940295d..04d7feb193846 100644 --- a/testing/config/mozharness/b2g_emulator_config.py +++ b/testing/config/mozharness/b2g_emulator_config.py @@ -44,7 +44,7 @@ "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", ], diff --git a/testing/modules/tests/xpcshell/xpcshell.ini b/testing/modules/tests/xpcshell/xpcshell.ini index 2382a96ec8163..9c1b0f0d6383a 100644 --- 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] diff --git a/testing/xpcshell/Makefile.in b/testing/xpcshell/Makefile.in index 4d11c1daa9d57..58d7c8f58f2ba 100644 --- a/testing/xpcshell/Makefile.in +++ b/testing/xpcshell/Makefile.in @@ -34,8 +34,6 @@ TEST_HARNESS_COMPONENTS := \ 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: diff --git a/testing/xpcshell/example/unit/xpcshell.ini b/testing/xpcshell/example/unit/xpcshell.ini index 50daba1328d7e..daca93a716e0f 100644 --- a/testing/xpcshell/example/unit/xpcshell.ini +++ b/testing/xpcshell/example/unit/xpcshell.ini @@ -5,6 +5,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' support-files = subdir/file.txt file.txt diff --git a/testing/xpcshell/mach_commands.py b/testing/xpcshell/mach_commands.py index d32aff09b4e4c..6fdcf89fe8a7b 100644 --- a/testing/xpcshell/mach_commands.py +++ b/testing/xpcshell/mach_commands.py @@ -257,7 +257,7 @@ def run_test(self, 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 @@ -379,7 +379,7 @@ def run_test(self, test_paths, b2g_home=None, busybox=None, device_name=None, 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'), diff --git a/testing/xpcshell/xpcshell_android.ini b/testing/xpcshell/xpcshell_android.ini deleted file mode 100644 index 980047b097eec..0000000000000 --- 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] diff --git a/testing/xpcshell/xpcshell_b2g.ini b/testing/xpcshell/xpcshell_b2g.ini deleted file mode 100644 index b2f9f90eada1c..0000000000000 --- a/testing/xpcshell/xpcshell_b2g.ini +++ /dev/null @@ -1,33 +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/telephony/test/xpcshell/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:services/fxaccounts/tests/xpcshell/xpcshell.ini] -[include:toolkit/devtools/discovery/tests/unit/xpcshell.ini] -[include:toolkit/devtools/security/tests/unit/xpcshell.ini] diff --git a/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini b/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini index 0936f926721b9..6731576c884a8 100644 --- a/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/asyncshutdown/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head=head.js tail= +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_AsyncShutdown.js] [test_AsyncShutdown_leave_uncaught.js] diff --git a/toolkit/components/autocomplete/tests/unit/xpcshell.ini b/toolkit/components/autocomplete/tests/unit/xpcshell.ini index 86e6787bdd1ad..86ac0df84f837 100644 --- a/toolkit/components/autocomplete/tests/unit/xpcshell.ini +++ b/toolkit/components/autocomplete/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_autocomplete.js tail = +skip-if = toolkit == 'gonk' [test_330578.js] [test_378079.js] diff --git a/toolkit/components/commandlines/test/unit/xpcshell.ini b/toolkit/components/commandlines/test/unit/xpcshell.ini index ea1318621b91a..0558c53a4cda6 100644 --- a/toolkit/components/commandlines/test/unit/xpcshell.ini +++ b/toolkit/components/commandlines/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/test_bug410156.desktop data/test_bug410156.url diff --git a/toolkit/components/commandlines/test/unit_unix/xpcshell.ini b/toolkit/components/commandlines/test/unit_unix/xpcshell.ini index 9044d4fea5dd1..fba15bb079dd7 100644 --- 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] diff --git a/toolkit/components/contentprefs/tests/unit/xpcshell.ini b/toolkit/components/contentprefs/tests/unit/xpcshell.ini index cbae178b1b360..a183ea3cf6906 100644 --- a/toolkit/components/contentprefs/tests/unit/xpcshell.ini +++ b/toolkit/components/contentprefs/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_contentPrefs.js tail = tail_contentPrefs.js +skip-if = toolkit == 'gonk' [test_bug248970.js] [test_bug503971.js] diff --git a/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini b/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini index daafc50208227..66e124474b1b4 100644 --- a/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini +++ b/toolkit/components/contentprefs/tests/unit_cps2/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = AsyncRunner.jsm [test_service.js] diff --git a/toolkit/components/crashes/tests/xpcshell/xpcshell.ini b/toolkit/components/crashes/tests/xpcshell/xpcshell.ini index 0492ad3183174..784739680c866 100644 --- a/toolkit/components/crashes/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/crashes/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_crash_manager.js] [test_crash_service.js] diff --git a/toolkit/components/crashmonitor/test/unit/xpcshell.ini b/toolkit/components/crashmonitor/test/unit/xpcshell.ini index addb698a52ec6..8627938fc40d8 100644 --- a/toolkit/components/crashmonitor/test/unit/xpcshell.ini +++ b/toolkit/components/crashmonitor/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_init.js] [test_valid_file.js] diff --git a/toolkit/components/ctypes/tests/unit/xpcshell.ini b/toolkit/components/ctypes/tests/unit/xpcshell.ini index 406f32b0fb40f..f813932fa8c81 100644 --- a/toolkit/components/ctypes/tests/unit/xpcshell.ini +++ b/toolkit/components/ctypes/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_errno.js] diff --git a/toolkit/components/downloads/test/unit/xpcshell.ini b/toolkit/components/downloads/test/unit/xpcshell.ini index fcf9d56efca4e..02c3432a69083 100644 --- a/toolkit/components/downloads/test/unit/xpcshell.ini +++ b/toolkit/components/downloads/test/unit/xpcshell.ini @@ -2,6 +2,7 @@ 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 diff --git a/toolkit/components/feeds/test/xpcshell.ini b/toolkit/components/feeds/test/xpcshell.ini index 5bc59770161f6..89e41fd7426b5 100644 --- a/toolkit/components/feeds/test/xpcshell.ini +++ b/toolkit/components/feeds/test/xpcshell.ini @@ -2,6 +2,7 @@ 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 diff --git a/toolkit/components/filepicker/test/unit/xpcshell.ini b/toolkit/components/filepicker/test/unit/xpcshell.ini index 3546edf47cb37..f690a0993da39 100644 --- 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' diff --git a/toolkit/components/filewatcher/tests/xpcshell/xpcshell.ini b/toolkit/components/filewatcher/tests/xpcshell/xpcshell.ini index bfd6298a1dfc9..d6cc968ebdb68 100644 --- a/toolkit/components/filewatcher/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/filewatcher/tests/xpcshell/xpcshell.ini @@ -1,8 +1,8 @@ [DEFAULT] head = head.js tail = - skip-if = os != "win" + [test_arguments.js] [test_no_error_callback.js] [test_remove_non_watched.js] diff --git a/toolkit/components/formautofill/test/xpcshell/xpcshell.ini b/toolkit/components/formautofill/test/xpcshell/xpcshell.ini index ab0ee0f9c96e6..0104376c97ffd 100644 --- a/toolkit/components/formautofill/test/xpcshell/xpcshell.ini +++ b/toolkit/components/formautofill/test/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [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 = diff --git a/toolkit/components/jsdownloads/test/unit/xpcshell.ini b/toolkit/components/jsdownloads/test/unit/xpcshell.ini index de6c86fc3f660..2cc4baa350c79 100644 --- a/toolkit/components/jsdownloads/test/unit/xpcshell.ini +++ b/toolkit/components/jsdownloads/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [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. diff --git a/toolkit/components/mediasniffer/test/unit/xpcshell.ini b/toolkit/components/mediasniffer/test/unit/xpcshell.ini index 79f618274c41b..357a09b6273ad 100644 --- a/toolkit/components/mediasniffer/test/unit/xpcshell.ini +++ b/toolkit/components/mediasniffer/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/detodos.mp3 data/ff-inst.exe diff --git a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini index 8f81d24c35380..98fcc764e2886 100644 --- a/toolkit/components/osfile/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/osfile/tests/xpcshell/xpcshell.ini @@ -1,6 +1,8 @@ [DEFAULT] head = head.js tail = +# Intermittently times out on debug b2g emulators +requesttimeoutfactor = 2 support-files = test_loader/module_test_loader.js diff --git a/toolkit/components/passwordmgr/test/unit/xpcshell.ini b/toolkit/components/passwordmgr/test/unit/xpcshell.ini index 2572aaf67bf71..4660e0790b6ad 100644 --- a/toolkit/components/passwordmgr/test/unit/xpcshell.ini +++ b/toolkit/components/passwordmgr/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [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. diff --git a/toolkit/components/places/tests/autocomplete/xpcshell.ini b/toolkit/components/places/tests/autocomplete/xpcshell.ini index e2a7fc2da3496..69dd26c35ad89 100644 --- a/toolkit/components/places/tests/autocomplete/xpcshell.ini +++ b/toolkit/components/places/tests/autocomplete/xpcshell.ini @@ -2,6 +2,7 @@ head = head_autocomplete.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_416211.js] [test_416214.js] diff --git a/toolkit/components/places/tests/bookmarks/xpcshell.ini b/toolkit/components/places/tests/bookmarks/xpcshell.ini index d42aa5959d578..339744372b1ae 100644 --- a/toolkit/components/places/tests/bookmarks/xpcshell.ini +++ b/toolkit/components/places/tests/bookmarks/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_bookmarks.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_384228.js] [test_385829.js] @@ -34,4 +35,4 @@ tail = [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] diff --git a/toolkit/components/places/tests/expiration/xpcshell.ini b/toolkit/components/places/tests/expiration/xpcshell.ini index d31e758cd04dd..a20a86a44d108 100644 --- a/toolkit/components/places/tests/expiration/xpcshell.ini +++ b/toolkit/components/places/tests/expiration/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_expiration.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_analyze_runs.js] # Bug 676989: test hangs consistently on Android diff --git a/toolkit/components/places/tests/favicons/xpcshell.ini b/toolkit/components/places/tests/favicons/xpcshell.ini index c9e12441b2e8f..3675a9dd31a87 100644 --- a/toolkit/components/places/tests/favicons/xpcshell.ini +++ b/toolkit/components/places/tests/favicons/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_favicons.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = expected-favicon-big16.ico.png expected-favicon-big32.jpg.png diff --git a/toolkit/components/places/tests/inline/xpcshell.ini b/toolkit/components/places/tests/inline/xpcshell.ini index 60c388d4793ea..bf242b5ad764d 100644 --- a/toolkit/components/places/tests/inline/xpcshell.ini +++ b/toolkit/components/places/tests/inline/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_autocomplete.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_autocomplete_functional.js] [test_casing.js] diff --git a/toolkit/components/places/tests/migration/xpcshell.ini b/toolkit/components/places/tests/migration/xpcshell.ini index 525a53582dcef..5be8549ab8235 100644 --- a/toolkit/components/places/tests/migration/xpcshell.ini +++ b/toolkit/components/places/tests/migration/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_migration.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = places_alpha.sqlite places_v10.sqlite diff --git a/toolkit/components/places/tests/network/xpcshell.ini b/toolkit/components/places/tests/network/xpcshell.ini index fc14e165b43ab..495f9f3d8f6dd 100644 --- 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] diff --git a/toolkit/components/places/tests/queries/xpcshell.ini b/toolkit/components/places/tests/queries/xpcshell.ini index 704ae46b28503..ec800ff85e218 100644 --- a/toolkit/components/places/tests/queries/xpcshell.ini +++ b/toolkit/components/places/tests/queries/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_queries.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_415716.js] [test_abstime-annotation-domain.js] diff --git a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini index f05a175f7cb99..e809487ea72ec 100644 --- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini +++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_autocomplete.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/engine-rel-searchform.xml diff --git a/toolkit/components/places/tests/unit/xpcshell.ini b/toolkit/components/places/tests/unit/xpcshell.ini index 68fcc27f0adfa..bb6ec863bef70 100644 --- a/toolkit/components/places/tests/unit/xpcshell.ini +++ b/toolkit/components/places/tests/unit/xpcshell.ini @@ -2,6 +2,7 @@ head = head_bookmarks.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = bookmarks.corrupt.html bookmarks.json diff --git a/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini b/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini index cb719ed7eed00..27bf097081b27 100644 --- a/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/promiseworker/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head= tail= +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files= data/worker.js data/chrome.manifest diff --git a/toolkit/components/satchel/test/unit/xpcshell.ini b/toolkit/components/satchel/test/unit/xpcshell.ini index 8fd6de72771e8..50feb1805af2a 100644 --- a/toolkit/components/satchel/test/unit/xpcshell.ini +++ b/toolkit/components/satchel/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_satchel.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = asyncformhistory_expire.sqlite formhistory_1000.sqlite diff --git a/toolkit/components/search/tests/xpcshell/xpcshell.ini b/toolkit/components/search/tests/xpcshell/xpcshell.ini index 76f7a605538e6..81c2548ef29e1 100644 --- a/toolkit/components/search/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/search/tests/xpcshell/xpcshell.ini @@ -2,6 +2,7 @@ head = head_search.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/chrome.manifest data/engine.src diff --git a/toolkit/components/social/test/xpcshell/xpcshell.ini b/toolkit/components/social/test/xpcshell/xpcshell.ini index 3cf84b66792c1..7fd75b043930b 100644 --- a/toolkit/components/social/test/xpcshell/xpcshell.ini +++ b/toolkit/components/social/test/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = blocklist.xml [test_SocialService.js] diff --git a/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini b/toolkit/components/sqlite/tests/xpcshell/xpcshell.ini index b83610f08a8ec..b833e9a9ee7f8 100644 --- 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] diff --git a/toolkit/components/startup/tests/unit/xpcshell.ini b/toolkit/components/startup/tests/unit/xpcshell.ini index 27c29fed715d7..1a9431ced13db 100644 --- 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] diff --git a/toolkit/components/telemetry/tests/unit/xpcshell.ini b/toolkit/components/telemetry/tests/unit/xpcshell.ini index 5cf17d4b93b1d..9febf651f4eb3 100644 --- a/toolkit/components/telemetry/tests/unit/xpcshell.ini +++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head.js tail = +skip-if = toolkit == 'gonk' [test_nsITelemetry.js] [test_TelemetryLateWrites.js] diff --git a/toolkit/components/url-classifier/tests/unit/xpcshell.ini b/toolkit/components/url-classifier/tests/unit/xpcshell.ini index e8ebd7a76acde..1c923b277a4a3 100644 --- a/toolkit/components/url-classifier/tests/unit/xpcshell.ini +++ b/toolkit/components/url-classifier/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_urlclassifier.js tail = tail_urlclassifier.js +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/digest1.chunk data/digest2.chunk diff --git a/toolkit/components/urlformatter/tests/unit/xpcshell.ini b/toolkit/components/urlformatter/tests/unit/xpcshell.ini index 0d0ef06daeef4..2152d0288c10d 100644 --- 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] diff --git a/toolkit/components/workerlz4/tests/xpcshell/xpcshell.ini b/toolkit/components/workerlz4/tests/xpcshell/xpcshell.ini index 52528b8c7a08a..9e29bf66fd0e0 100644 --- a/toolkit/components/workerlz4/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/workerlz4/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = data/worker_lz4.js data/chrome.manifest diff --git a/toolkit/components/xulstore/tests/xpcshell/xpcshell.ini b/toolkit/components/xulstore/tests/xpcshell/xpcshell.ini index fbaf22bbc5b93..fd1b432de08f9 100644 --- a/toolkit/components/xulstore/tests/xpcshell/xpcshell.ini +++ b/toolkit/components/xulstore/tests/xpcshell/xpcshell.ini @@ -1,5 +1,5 @@ [DEFAULT] - +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = localstore.rdf diff --git a/toolkit/content/tests/unit/xpcshell.ini b/toolkit/content/tests/unit/xpcshell.ini index 26d25457b6366..72a4f637d4545 100644 --- 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] diff --git a/toolkit/crashreporter/test/unit/xpcshell.ini b/toolkit/crashreporter/test/unit/xpcshell.ini index 83eac0fa5e4f3..09dfa01e627a1 100644 --- a/toolkit/crashreporter/test/unit/xpcshell.ini +++ b/toolkit/crashreporter/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_crashreporter.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = crasher_subprocess_head.js crasher_subprocess_tail.js diff --git a/toolkit/crashreporter/test/unit_ipc/xpcshell.ini b/toolkit/crashreporter/test/unit_ipc/xpcshell.ini index bc4fa04d1ea42..1f37c69c6920d 100644 --- 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] diff --git a/toolkit/devtools/acorn/tests/unit/xpcshell.ini b/toolkit/devtools/acorn/tests/unit/xpcshell.ini index 57b9ce8c20742..f7f11cbf27e85 100644 --- a/toolkit/devtools/acorn/tests/unit/xpcshell.ini +++ b/toolkit/devtools/acorn/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_acorn.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_import_acorn.js] [test_same_ast.js] diff --git a/toolkit/devtools/apps/tests/unit/xpcshell.ini b/toolkit/devtools/apps/tests/unit/xpcshell.ini index 18ec19c24d302..79a69c323cb87 100644 --- a/toolkit/devtools/apps/tests/unit/xpcshell.ini +++ b/toolkit/devtools/apps/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_apps.js tail = tail_apps.js +skip-if = toolkit == 'android' support-files = data/app.zip [test_webappsActor.js] diff --git a/toolkit/devtools/jsbeautify/tests/unit/xpcshell.ini b/toolkit/devtools/jsbeautify/tests/unit/xpcshell.ini index b0b9aee8ef97a..87706031d9f9c 100644 --- 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] diff --git a/toolkit/devtools/pretty-fast/tests/unit/xpcshell.ini b/toolkit/devtools/pretty-fast/tests/unit/xpcshell.ini index 94833e2928976..a29d265f4c024 100644 --- 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] diff --git a/toolkit/devtools/security/tests/unit/xpcshell.ini b/toolkit/devtools/security/tests/unit/xpcshell.ini index 0804af8a5268c..b1bccfcb19240 100644 --- 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] diff --git a/toolkit/devtools/server/tests/unit/xpcshell.ini b/toolkit/devtools/server/tests/unit/xpcshell.ini index d97bbbac7ceb0..ed36eba1ad7ee 100644 --- a/toolkit/devtools/server/tests/unit/xpcshell.ini +++ b/toolkit/devtools/server/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_dbg.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = source-map-data/sourcemapped.coffee diff --git a/toolkit/devtools/tern/tests/unit/xpcshell.ini b/toolkit/devtools/tern/tests/unit/xpcshell.ini index 72262b3a38d4e..29d662cd38d73 100644 --- 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] diff --git a/toolkit/devtools/tests/unit/xpcshell.ini b/toolkit/devtools/tests/unit/xpcshell.ini index 7f82e6882c771..e1f22e5eaa924 100644 --- a/toolkit/devtools/tests/unit/xpcshell.ini +++ b/toolkit/devtools/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_devtools.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_independent_loaders.js] [test_invisible_loader.js] @@ -8,4 +9,4 @@ tail = [test_defineLazyPrototypeGetter.js] [test_async-utils.js] [test_consoleID.js] -[test_require_lazy.js] \ No newline at end of file +[test_require_lazy.js] diff --git a/toolkit/devtools/transport/tests/unit/xpcshell.ini b/toolkit/devtools/transport/tests/unit/xpcshell.ini index d41d39ec75a51..30b5fdebc9838 100644 --- a/toolkit/devtools/transport/tests/unit/xpcshell.ini +++ b/toolkit/devtools/transport/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_dbg.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = testactors.js diff --git a/toolkit/devtools/webconsole/test/unit/xpcshell.ini b/toolkit/devtools/webconsole/test/unit/xpcshell.ini index 8713897556fac..3ef474926c4ec 100644 --- a/toolkit/devtools/webconsole/test/unit/xpcshell.ini +++ b/toolkit/devtools/webconsole/test/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = [test_js_property_provider.js] diff --git a/toolkit/forgetaboutsite/test/unit/xpcshell.ini b/toolkit/forgetaboutsite/test/unit/xpcshell.ini index e173411cafa68..a4e800e2446d4 100644 --- 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] diff --git a/toolkit/identity/tests/unit/xpcshell.ini b/toolkit/identity/tests/unit/xpcshell.ini index 0e9670480c572..0355d765a07cc 100644 --- a/toolkit/identity/tests/unit/xpcshell.ini +++ b/toolkit/identity/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [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 diff --git a/toolkit/modules/tests/xpcshell/xpcshell.ini b/toolkit/modules/tests/xpcshell/xpcshell.ini index 3adfb49d0cd8e..ee361d887711b 100644 --- a/toolkit/modules/tests/xpcshell/xpcshell.ini +++ b/toolkit/modules/tests/xpcshell/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' support-files = propertyLists/bug710259_propertyListBinary.plist propertyLists/bug710259_propertyListXML.plist diff --git a/toolkit/mozapps/downloads/tests/unit/xpcshell.ini b/toolkit/mozapps/downloads/tests/unit/xpcshell.ini index 8dae3c54e6b1e..877816ef63e70 100644 --- a/toolkit/mozapps/downloads/tests/unit/xpcshell.ini +++ b/toolkit/mozapps/downloads/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_downloads.js tail = +skip-if = toolkit == 'android' [test_DownloadPaths.js] [test_DownloadUtils.js] diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini index 68c69635c7f56..397751e820161 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini +++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-shared.ini @@ -1,4 +1,7 @@ # 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" diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini index 095b4ea23a0f6..51520f888cbcc 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini +++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell-unpack.ini @@ -2,6 +2,7 @@ head = head_addons.js head_unpack.js tail = firefox-appdir = browser +skip-if = toolkit == 'android' || toolkit == 'gonk' dupe-manifest = [include:xpcshell-shared.ini] diff --git a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini index fa780d51f0de6..8d0f05b65a48e 100644 --- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini +++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'mulet' +skip-if = buildapp == 'mulet' || toolkit == 'android' || toolkit == 'gonk' head = head_addons.js tail = firefox-appdir = browser diff --git a/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini b/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini index f5e180762f235..f1024f4af825a 100644 --- a/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini +++ b/toolkit/mozapps/update/tests/unit_aus_update/xpcshell.ini @@ -5,6 +5,7 @@ [DEFAULT] head = head_update.js tail = +skip-if = toolkit == 'android' generated-files = head_update.js [canCheckForAndCanApplyUpdates.js] diff --git a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini index d3de6b586ebad..ea9e0d08b5735 100644 --- a/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini +++ b/toolkit/mozapps/update/tests/unit_base_updater/xpcshell.ini @@ -9,6 +9,7 @@ [DEFAULT] head = head_update.js tail = +skip-if = toolkit == 'android' generated-files = head_update.js [marSuccessComplete.js] diff --git a/toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini b/toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini index 8f5ab7009c434..e79845dd7ac62 100644 --- a/toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini +++ b/toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini @@ -5,6 +5,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'android' [consumerNotifications.js] # Bug 676992: test consistently fails on Android diff --git a/tools/profiler/tests/xpcshell.ini b/tools/profiler/tests/xpcshell.ini index 7af14cbd1b101..00d0ab020206a 100644 --- a/tools/profiler/tests/xpcshell.ini +++ b/tools/profiler/tests/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_profiler.js tail = +skip-if = toolkit == 'android' || toolkit == 'gonk' [test_start.js] skip-if = true diff --git a/uriloader/exthandler/tests/unit/xpcshell.ini b/uriloader/exthandler/tests/unit/xpcshell.ini index d9754497fe5af..1874c2f7b9784 100644 --- a/uriloader/exthandler/tests/unit/xpcshell.ini +++ b/uriloader/exthandler/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [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] diff --git a/widget/tests/unit/xpcshell.ini b/widget/tests/unit/xpcshell.ini index d0e8f87012d6c..ab98338a55181 100644 --- a/widget/tests/unit/xpcshell.ini +++ b/widget/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = tail = +skip-if = toolkit == 'gonk' [test_taskbar_jumplistitems.js] [test_macwebapputils.js] diff --git a/xpcom/tests/unit/xpcshell.ini b/xpcom/tests/unit/xpcshell.ini index 3105a5135f3e4..82db76e2ba7d2 100644 --- a/xpcom/tests/unit/xpcshell.ini +++ b/xpcom/tests/unit/xpcshell.ini @@ -1,6 +1,7 @@ [DEFAULT] head = head_xpcom.js tail = +skip-if = toolkit == 'gonk' support-files = bug725015.manifest compmgr_warnings.manifest