Bug 1026290 - Update mochitest-chrome manifests for android; r=jgriffin
authorGeoff Brown <gbrown@mozilla.com>
Fri, 10 Jul 2015 14:41:59 -0600
changeset 252393 6f07416ab9bb330f7c535b0591665d79edbb4486
parent 252392 d10aa8e7b3d77b35d2ab0c76f9462f3293c08d56
child 252394 10e53b335c481728ed2caea2ce09852b30b1e1c3
push id13977
push usercbook@mozilla.com
push dateMon, 13 Jul 2015 12:54:14 +0000
treeherderfx-team@149e770b65ac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs1026290
milestone42.0a1
Bug 1026290 - Update mochitest-chrome manifests for android; r=jgriffin
caps/tests/mochitest/chrome.ini
docshell/test/chrome/chrome.ini
dom/activities/tests/mochi/mochitest.ini
dom/apps/tests/chrome.ini
dom/base/test/chrome.ini
dom/base/test/chrome/chrome.ini
dom/broadcastchannel/tests/chrome.ini
dom/canvas/test/chrome/chrome.ini
dom/devicestorage/test/chrome.ini
dom/events/test/chrome.ini
dom/html/test/chrome.ini
dom/ipc/tests/chrome.ini
dom/security/test/csp/chrome.ini
dom/tests/mochitest/beacon/chrome.ini
dom/tests/mochitest/chrome/chrome.ini
dom/tests/mochitest/general/chrome.ini
dom/tests/mochitest/localstorage/chrome.ini
dom/tests/mochitest/webapps/chrome.ini
dom/workers/test/chrome.ini
dom/workers/test/serviceworkers/chrome.ini
dom/xul/templates/tests/chrome/chrome.ini
editor/composer/test/chrome.ini
editor/libeditor/tests/chrome.ini
extensions/cookie/test/chrome.ini
extensions/spellcheck/tests/chrome/chrome.ini
image/test/mochitest/chrome.ini
js/xpconnect/tests/chrome/chrome.ini
layout/base/tests/chrome/chrome.ini
layout/forms/test/chrome.ini
layout/generic/test/chrome.ini
layout/inspector/tests/chrome/chrome.ini
layout/style/test/chrome/chrome.ini
layout/xul/test/chrome.ini
security/manager/ssl/tests/mochitest/bugs/chrome.ini
security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
services/fxaccounts/tests/mochitest/chrome.ini
testing/mochitest/chrome/chrome.ini
toolkit/components/aboutmemory/tests/chrome.ini
toolkit/components/ctypes/tests/chrome/chrome.ini
toolkit/components/osfile/tests/mochi/chrome.ini
toolkit/components/passwordmgr/test/chrome.ini
toolkit/components/url-classifier/tests/mochitest/chrome.ini
toolkit/content/tests/chrome/chrome.ini
toolkit/content/tests/widgets/chrome.ini
toolkit/devtools/qrcode/tests/mochitest/chrome.ini
toolkit/devtools/server/tests/mochitest/chrome.ini
toolkit/devtools/tests/mochitest/chrome.ini
toolkit/identity/tests/chrome/chrome.ini
toolkit/mozapps/downloads/tests/chrome/chrome.ini
toolkit/webapps/tests/chrome.ini
widget/tests/chrome.ini
xpfe/appshell/test/chrome.ini
--- a/caps/tests/mochitest/chrome.ini
+++ b/caps/tests/mochitest/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   file_disableScript.html
 
 [test_bug995943.xul]
 [test_disableScript.xul]
 [test_principal_jarprefix_origin_appid_appstatus.html]
 # jarPrefix test doesn't work on Windows, see bug 776296.
 skip-if = os == "win"
--- a/docshell/test/chrome/chrome.ini
+++ b/docshell/test/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   662200a.html
   662200b.html
   662200c.html
   89419.html
   92598_nostore.html
   bug112564_window.xul
   bug113934_window.xul
--- a/dom/activities/tests/mochi/mochitest.ini
+++ b/dom/activities/tests/mochi/mochitest.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = e10s
+skip-if = e10s || os == 'android'
 support-files =
   common.js
   system.webapp
   system.webapp^headers^
   manifest.webapp
   manifest.webapp^headers^
 
 [test_dev_mode_activity.html]
--- a/dom/apps/tests/chrome.ini
+++ b/dom/apps/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   asmjs/*
   file_bug_945152.html
   file_bug_945152.sjs
 
 [test_apps_service.xul]
 [test_bug_945152.html]
 skip-if = os != 'linux'
--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   file_url.jsm
   file_empty.html
   file_bug945152.jar
   file_bug945152_worker.js
   file_bug1008126_worker.js
 
 [test_anonymousContent_xul_window.xul]
--- a/dom/base/test/chrome/chrome.ini
+++ b/dom/base/test/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   blockNoPlugins.xml
   blockPluginHard.xml
   bug418986-1.js
   cpows_child.js
   cpows_parent.xul
   file_bug391728.html
   file_bug391728_2.html
--- a/dom/broadcastchannel/tests/chrome.ini
+++ b/dom/broadcastchannel/tests/chrome.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
-skip-if = e10s || buildapp == 'b2g'
+skip-if = e10s || buildapp == 'b2g' || os == 'android'
 support-files =
   blank.html
 
 [test_broadcastchannel_private_browsing.html]
--- a/dom/canvas/test/chrome/chrome.ini
+++ b/dom/canvas/test/chrome/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files = nonchrome_webgl_debug_renderer_info.html
 
 [test_webgl_debug_renderer_info.html]
 [test_drawWindow_widget_layers.html]
 support-files = ../file_drawWindow_source.html ../file_drawWindow_common.js
--- a/dom/devicestorage/test/chrome.ini
+++ b/dom/devicestorage/test/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet' || os == 'android')
 
 [test_app_permissions.html]
 [test_fs_app_permissions.html]
--- a/dom/events/test/chrome.ini
+++ b/dom/events/test/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   bug415498-doc1.html
   bug415498-doc2.html
   bug418986-3.js
   bug591249_iframe.xul
   bug602962.xul
   file_bug679494.html
   window_bug617528.xul
--- a/dom/html/test/chrome.ini
+++ b/dom/html/test/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   file_anchor_ping.html
 
 [test_allowMedia.html]
 [test_anchor_ping.html]
--- a/dom/ipc/tests/chrome.ini
+++ b/dom/ipc/tests/chrome.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   process_error.xul
   process_error_contentscript.js
 
 [test_process_error.xul]
 skip-if = buildapp == "mulet" || !crashreporter
--- a/dom/security/test/csp/chrome.ini
+++ b/dom/security/test/csp/chrome.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_bug768029.html]
 [test_bug773891.html]
--- a/dom/tests/mochitest/beacon/chrome.ini
+++ b/dom/tests/mochitest/beacon/chrome.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_beaconCookies.html]
 support-files = beacon-set-cookie.sjs
                 file_beaconCookies.html
--- a/dom/tests/mochitest/chrome/chrome.ini
+++ b/dom/tests/mochitest/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   489127.html
   DOMWindowCreated_chrome.xul
   DOMWindowCreated_content.html
   MozDomFullscreen_chrome.xul
   child_focus_frame.html
   file_DOM_element_instanceof.xul
   file_MozDomFullscreen.html
--- a/dom/tests/mochitest/general/chrome.ini
+++ b/dom/tests/mochitest/general/chrome.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_innerScreen.xul]
 [test_offsets.css]
 [test_offsets.js]
 [test_offsets.xul]
 skip-if = buildapp == 'mulet'
--- a/dom/tests/mochitest/localstorage/chrome.ini
+++ b/dom/tests/mochitest/localstorage/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   frame_clear_browser_data.html
   page_blank.html
 
 [test_app_uninstall.html]
 [test_clear_browser_data.html]
 [test_localStorageBasePrivateBrowsing_perwindowpb.html]
 [test_localStorageFromChrome.xhtml]
--- a/dom/tests/mochitest/webapps/chrome.ini
+++ b/dom/tests/mochitest/webapps/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   cross_origin.html
   head.js
   install_and_redirect_helper.xul
   apps/*
 
 [test_bug_765063.xul]
 [test_bug_771294.xul]
--- a/dom/workers/test/chrome.ini
+++ b/dom/workers/test/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   WorkerDebugger.initialize_childWorker.js
   WorkerDebugger.initialize_debugger.js
   WorkerDebugger.initialize_worker.js
   WorkerDebugger.isFrozen_iframe1.html
   WorkerDebugger.isFrozen_iframe2.html
   WorkerDebugger.isFrozen_worker1.js
   WorkerDebugger.isFrozen_worker2.js
--- a/dom/workers/test/serviceworkers/chrome.ini
+++ b/dom/workers/test/serviceworkers/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   app/*
 
 [test_app_installation.html]
 [test_privateBrowsing.html]
--- a/dom/xul/templates/tests/chrome/chrome.ini
+++ b/dom/xul/templates/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet' || os == 'android')
 support-files =
   animals.rdf
   animals.sqlite
   animals.xml
   bug441785-1.rdf
   bug441785-2.rdf
   templates_shared.js
 
--- a/editor/composer/test/chrome.ini
+++ b/editor/composer/test/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_async_UpdateCurrentDictionary.html]
 [test_bug338427.html]
 [test_bug434998.xul]
 [test_bug678842.html]
--- a/editor/libeditor/tests/chrome.ini
+++ b/editor/libeditor/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files = green.png
 
 [test_bug46555.html]
 [test_bug366682.html]
 support-files = spellcheck.js
 [test_bug471319.html]
 [test_bug483651.html]
 [test_bug489202.xul]
--- a/extensions/cookie/test/chrome.ini
+++ b/extensions/cookie/test/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files = channel_utils.js
 
 [test_app_uninstall_cookies.html]
 [test_app_uninstall_permissions.html]
 [test_permissionmanager_app_isolation.html]
--- a/extensions/spellcheck/tests/chrome/chrome.ini
+++ b/extensions/spellcheck/tests/chrome/chrome.ini
@@ -1,9 +1,9 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_add_remove_dictionaries.xul]
 support-files =
   base/base_utf.dic
   base/base_utf.aff
   map/maputf.dic
   map/maputf.aff
--- a/image/test/mochitest/chrome.ini
+++ b/image/test/mochitest/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   animated-gif-finalframe.gif
   animated-gif.gif
   animated-gif2.gif
   animated1.gif
   animated2.gif
   animation.svg
   animationPolling.js
--- a/js/xpconnect/tests/chrome/chrome.ini
+++ b/js/xpconnect/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   bug503926.xul
   file_bug618176.xul
   file_bug996069.html
   file_bug1050049.xml
   file_discardSystemSource.html
   worker_discardSystemSource.js
   file_evalInSandbox.html
--- a/layout/base/tests/chrome/chrome.ini
+++ b/layout/base/tests/chrome/chrome.ini
@@ -1,9 +1,10 @@
 [DEFAULT]
+skip-if = os == 'android'
 support-files =
   animated.gif
   blue-32x32.png
   bug495648.rdf
   bug551434_childframe.html
   chrome_content_integration_window.xul
   chrome_over_plugin_window.xul
   default_background_window.xul
--- a/layout/forms/test/chrome.ini
+++ b/layout/forms/test/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   bug536567_iframe.html
   bug536567_subframe.html
   bug665540_window.xul
 
 [test_bug536567_perwindowpb.html]
 [test_bug665540.html]
 skip-if = buildapp == 'mulet'
--- a/layout/generic/test/chrome.ini
+++ b/layout/generic/test/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   file_bug514732_window.xul
   frame_selection_underline-ref.xhtml
   frame_selection_underline.css
   frame_selection_underline.xhtml
 
 [test_backspace_delete.xul]
 skip-if = true # Bug 1163311
--- a/layout/inspector/tests/chrome/chrome.ini
+++ b/layout/inspector/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files = GentiumPlus-R.woff
 
 [test_bug467669.css]
 [test_bug467669.xul]
 [test_bug695639.css]
 [test_bug695639.xul]
 [test_bug708874.css]
 [test_bug708874.xul]
--- a/layout/style/test/chrome/chrome.ini
+++ b/layout/style/test/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   bug418986-2.js
   bug535806-css.css
   bug535806-html.html
   bug535806-xul.xul
   hover_helper.html
 
 [test_addSheet.html]
--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   window_resizer.xul
   window_resizer_element.xul
 
 [test_bug159346.xul]
 skip-if = buildapp == 'mulet'
 [test_bug372685.xul]
 [test_bug381167.xhtml]
--- a/security/manager/ssl/tests/mochitest/bugs/chrome.ini
+++ b/security/manager/ssl/tests/mochitest/bugs/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 tags = psm
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_bug413909.html]
 skip-if = buildapp == 'mulet'
 [test_certificate_overrides.html]
--- a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
+++ b/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini
@@ -1,6 +1,6 @@
 [DEFAULT]
 tags = psm
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files = page_blank.html
 
 [test_sts_privatebrowsing_perwindowpb.html]
--- a/services/fxaccounts/tests/mochitest/chrome.ini
+++ b/services/fxaccounts/tests/mochitest/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files=
   file_invalidEmailCase.sjs
 
 [test_invalidEmailCase.html]
 
--- a/testing/mochitest/chrome/chrome.ini
+++ b/testing/mochitest/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files = test-dir/test-file
 
 [test_sample.xul]
 [test_sanityChromeUtils.xul]
 skip-if = buildapp == 'mulet'
 [test_sanityPluginUtils.html]
 skip-if = buildapp == 'mulet'
 [test_sanityException.xul]
--- a/toolkit/components/aboutmemory/tests/chrome.ini
+++ b/toolkit/components/aboutmemory/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' || buildapp == 'mulet')
+skip-if = (buildapp == 'b2g' || buildapp == 'mulet' || os == 'android')
 support-files =
   crash-dump-diff1.json
   crash-dump-diff2.json
   crash-dump-good.json
   memory-reports-bad.json
   memory-reports-diff1.json
   memory-reports-diff2.json
   memory-reports-good.json
--- a/toolkit/components/ctypes/tests/chrome/chrome.ini
+++ b/toolkit/components/ctypes/tests/chrome/chrome.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   xpcshellTestHarnessAdaptor.js
   ctypes_worker.js
   ../unit/test_jsctypes.js
 
 [test_ctypes.xul]
--- a/toolkit/components/osfile/tests/mochi/chrome.ini
+++ b/toolkit/components/osfile/tests/mochi/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   main_test_osfile_async.js
   worker_handler.js
   worker_test_osfile_comms.js
   worker_test_osfile_front.js
   worker_test_osfile_shared.js
   worker_test_osfile_unix.js
   worker_test_osfile_win.js
--- a/toolkit/components/passwordmgr/test/chrome.ini
+++ b/toolkit/components/passwordmgr/test/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   formsubmit.sjs
   notification_common.js
   pwmgr_common.js
 
 [test_formless_autofill.html]
 [test_formless_submit.html]
 [test_privbrowsing_perwindowpb.html]
--- a/toolkit/components/url-classifier/tests/mochitest/chrome.ini
+++ b/toolkit/components/url-classifier/tests/mochitest/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   allowlistAnnotatedFrame.html
   classifiedAnnotatedFrame.html
   classifiedAnnotatedPBFrame.html
 
 [test_lookup_system_principal.html]
 [test_classified_annotations.html]
 tags = trackingprotection
--- a/toolkit/content/tests/chrome/chrome.ini
+++ b/toolkit/content/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   ../widgets/popup_shared.js
   ../widgets/tree_shared.js
   RegisterUnregisterChrome.js
   bug263683_window.xul
   bug304188_window.xul
   bug331215_window.xul
   bug360437_window.xul
--- a/toolkit/content/tests/widgets/chrome.ini
+++ b/toolkit/content/tests/widgets/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   tree_shared.js
   popup_shared.js
   window_menubar.xul
   seek_with_sound.ogg
 
 [test_contextmenu_nested.xul]
 skip-if = os == 'linux' # Bug 1116215
--- a/toolkit/devtools/qrcode/tests/mochitest/chrome.ini
+++ b/toolkit/devtools/qrcode/tests/mochitest/chrome.ini
@@ -1,4 +1,5 @@
 [DEFAULT]
+skip-if = os == 'android'
 tags = devtools
 
 [test_decode.html]
--- a/toolkit/devtools/server/tests/mochitest/chrome.ini
+++ b/toolkit/devtools/server/tests/mochitest/chrome.ini
@@ -1,11 +1,11 @@
 [DEFAULT]
 tags = devtools
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   Debugger.Source.prototype.element.js
   Debugger.Source.prototype.element-2.js
   Debugger.Source.prototype.element.html
   director-helpers.js
   hello-actor.js
   inspector_getImageData.html
   inspector-helpers.js
--- a/toolkit/devtools/tests/mochitest/chrome.ini
+++ b/toolkit/devtools/tests/mochitest/chrome.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 tags = devtools
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_eventemitter_basic.html]
 [test_devtools_extensions.html]
 [test_loader_paths.html]
--- a/toolkit/identity/tests/chrome/chrome.ini
+++ b/toolkit/identity/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   sandbox_content.html
   sandbox_content.sjs
   sandbox_content_alert.html
   sandbox_content_framed.html
   sandbox_content_perms.html
   sandbox_content_popup.html
   sandbox_content_redirect.html
--- a/toolkit/mozapps/downloads/tests/chrome/chrome.ini
+++ b/toolkit/mozapps/downloads/tests/chrome/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   unknownContentType_dialog_layout_data.pif
   unknownContentType_dialog_layout_data.pif^headers^
   unknownContentType_dialog_layout_data.txt
   unknownContentType_dialog_layout_data.txt^headers^
   utils.js
 
 [test_backspace_key_removes.xul]
--- a/toolkit/webapps/tests/chrome.ini
+++ b/toolkit/webapps/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'mulet' || buildapp == 'b2g' || os == "mac" && os_version == "10.6" # see bug 993690
+skip-if = buildapp == 'mulet' || buildapp == 'b2g' || os == 'android' || os == "mac" && os_version == "10.6" # see bug 993690
 support-files =
   head.js
   app.sjs
   data/*
 
 [test_custom_origin.xul]
 skip-if = asan
 [test_custom_origin_uninstall_install.xul]
--- a/widget/tests/chrome.ini
+++ b/widget/tests/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 support-files =
   empty_window.xul
   utils.js
 
 [test_bug343416.xul]
 skip-if = debug
 [test_bug429954.xul]
 support-files = window_bug429954.xul
--- a/xpfe/appshell/test/chrome.ini
+++ b/xpfe/appshell/test/chrome.ini
@@ -1,4 +1,4 @@
 [DEFAULT]
-skip-if = buildapp == 'b2g'
+skip-if = buildapp == 'b2g' || os == 'android'
 
 [test_hiddenPrivateWindow.xul]