Bug 1066735 - Remove root b2g and android specific xpcshell manifests…

…, r=chmanchester
Brli · Oct 7, 2014 · 903d025 · 903d025
1 parent 8c8ddba
commit 903d025
Show file tree

Hide file tree

Showing 149 changed files with 155 additions and 107 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,7 @@
 [DEFAULT]
 head = head_libmar.js
 tail =
+skip-if = toolkit == 'gonk'
 support-files = data/**
 
 [test_create.js]