diff --git a/caps/tests/mochitest/chrome.ini b/caps/tests/mochitest/chrome.ini index 71b166f6595..8ec36e97e27 100644 --- a/caps/tests/mochitest/chrome.ini +++ b/caps/tests/mochitest/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = file_disableScript.html diff --git a/docshell/test/chrome/chrome.ini b/docshell/test/chrome/chrome.ini index 3adcb5eba08..4b82630efa2 100644 --- a/docshell/test/chrome/chrome.ini +++ b/docshell/test/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = 662200a.html 662200b.html diff --git a/dom/activities/tests/mochi/mochitest.ini b/dom/activities/tests/mochi/mochitest.ini index ac245e83e09..6b9332fa2f8 100644 --- a/dom/activities/tests/mochi/mochitest.ini +++ b/dom/activities/tests/mochi/mochitest.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = e10s +skip-if = e10s || os == 'android' support-files = common.js system.webapp diff --git a/dom/apps/tests/chrome.ini b/dom/apps/tests/chrome.ini index 61aab4c1d16..8020c2cb3ee 100644 --- a/dom/apps/tests/chrome.ini +++ b/dom/apps/tests/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = asmjs/* file_bug_945152.html diff --git a/dom/base/test/chrome.ini b/dom/base/test/chrome.ini index 9684ee8dba5..f129293efd9 100644 --- a/dom/base/test/chrome.ini +++ b/dom/base/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = file_url.jsm file_empty.html diff --git a/dom/base/test/chrome/chrome.ini b/dom/base/test/chrome/chrome.ini index 3e223aed598..173f424292e 100644 --- a/dom/base/test/chrome/chrome.ini +++ b/dom/base/test/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = blockNoPlugins.xml blockPluginHard.xml diff --git a/dom/broadcastchannel/tests/chrome.ini b/dom/broadcastchannel/tests/chrome.ini index a61b9b5f526..9305e41974a 100644 --- a/dom/broadcastchannel/tests/chrome.ini +++ b/dom/broadcastchannel/tests/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = e10s || buildapp == 'b2g' +skip-if = e10s || buildapp == 'b2g' || os == 'android' support-files = blank.html diff --git a/dom/canvas/test/chrome/chrome.ini b/dom/canvas/test/chrome/chrome.ini index 0d6107fae85..af57a2c5b7f 100644 --- a/dom/canvas/test/chrome/chrome.ini +++ b/dom/canvas/test/chrome/chrome.ini @@ -1,5 +1,5 @@ [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] diff --git a/dom/devicestorage/test/chrome.ini b/dom/devicestorage/test/chrome.ini index bedf4638bbc..4524a0e900c 100644 --- 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] diff --git a/dom/events/test/chrome.ini b/dom/events/test/chrome.ini index bdc8ebc1695..aac9e0d6fad 100644 --- a/dom/events/test/chrome.ini +++ b/dom/events/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = bug415498-doc1.html bug415498-doc2.html diff --git a/dom/html/test/chrome.ini b/dom/html/test/chrome.ini index 8fc13b0fa59..e86c2c2ab81 100644 --- a/dom/html/test/chrome.ini +++ b/dom/html/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = file_anchor_ping.html diff --git a/dom/ipc/tests/chrome.ini b/dom/ipc/tests/chrome.ini index a4899117464..81a53619749 100644 --- a/dom/ipc/tests/chrome.ini +++ b/dom/ipc/tests/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = process_error.xul process_error_contentscript.js diff --git a/dom/security/test/csp/chrome.ini b/dom/security/test/csp/chrome.ini index 92862ebd6b7..917463086b1 100644 --- 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] diff --git a/dom/tests/mochitest/beacon/chrome.ini b/dom/tests/mochitest/beacon/chrome.ini index 73541e8a310..09991a18d51 100644 --- a/dom/tests/mochitest/beacon/chrome.ini +++ b/dom/tests/mochitest/beacon/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' [test_beaconCookies.html] support-files = beacon-set-cookie.sjs diff --git a/dom/tests/mochitest/chrome/chrome.ini b/dom/tests/mochitest/chrome/chrome.ini index d43f22f32eb..c4ca8ee0456 100644 --- a/dom/tests/mochitest/chrome/chrome.ini +++ b/dom/tests/mochitest/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = 489127.html DOMWindowCreated_chrome.xul diff --git a/dom/tests/mochitest/general/chrome.ini b/dom/tests/mochitest/general/chrome.ini index 83bdb93f34b..b6b023b42eb 100644 --- a/dom/tests/mochitest/general/chrome.ini +++ b/dom/tests/mochitest/general/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' [test_innerScreen.xul] [test_offsets.css] diff --git a/dom/tests/mochitest/localstorage/chrome.ini b/dom/tests/mochitest/localstorage/chrome.ini index 3c4a3362dc3..bc768e3fccb 100644 --- a/dom/tests/mochitest/localstorage/chrome.ini +++ b/dom/tests/mochitest/localstorage/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = frame_clear_browser_data.html page_blank.html diff --git a/dom/tests/mochitest/webapps/chrome.ini b/dom/tests/mochitest/webapps/chrome.ini index 21a6b1debf6..ab089785f36 100644 --- a/dom/tests/mochitest/webapps/chrome.ini +++ b/dom/tests/mochitest/webapps/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = cross_origin.html head.js diff --git a/dom/workers/test/chrome.ini b/dom/workers/test/chrome.ini index d79981d12ed..9860440107b 100644 --- a/dom/workers/test/chrome.ini +++ b/dom/workers/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = WorkerDebugger.initialize_childWorker.js WorkerDebugger.initialize_debugger.js diff --git a/dom/workers/test/serviceworkers/chrome.ini b/dom/workers/test/serviceworkers/chrome.ini index 42a89527496..db71394a858 100644 --- a/dom/workers/test/serviceworkers/chrome.ini +++ b/dom/workers/test/serviceworkers/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = app/* diff --git a/dom/xul/templates/tests/chrome/chrome.ini b/dom/xul/templates/tests/chrome/chrome.ini index b557b401a3f..69a6b5d5f64 100644 --- a/dom/xul/templates/tests/chrome/chrome.ini +++ b/dom/xul/templates/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = (buildapp == 'b2g' || buildapp == 'mulet') +skip-if = (buildapp == 'b2g' || buildapp == 'mulet' || os == 'android') support-files = animals.rdf animals.sqlite diff --git a/editor/composer/test/chrome.ini b/editor/composer/test/chrome.ini index d07480ba060..ab73d898684 100644 --- a/editor/composer/test/chrome.ini +++ b/editor/composer/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' [test_async_UpdateCurrentDictionary.html] [test_bug338427.html] diff --git a/editor/libeditor/tests/chrome.ini b/editor/libeditor/tests/chrome.ini index 7ad20b75832..8309d9d348c 100644 --- a/editor/libeditor/tests/chrome.ini +++ b/editor/libeditor/tests/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = green.png [test_bug46555.html] diff --git a/extensions/cookie/test/chrome.ini b/extensions/cookie/test/chrome.ini index 76bb729f776..3f124485bdd 100644 --- a/extensions/cookie/test/chrome.ini +++ b/extensions/cookie/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = channel_utils.js [test_app_uninstall_cookies.html] diff --git a/extensions/spellcheck/tests/chrome/chrome.ini b/extensions/spellcheck/tests/chrome/chrome.ini index 430f6a68fce..1a0c8c0ec28 100644 --- a/extensions/spellcheck/tests/chrome/chrome.ini +++ b/extensions/spellcheck/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' [test_add_remove_dictionaries.xul] support-files = diff --git a/image/test/mochitest/chrome.ini b/image/test/mochitest/chrome.ini index f83953dc6e6..6b5443eaf42 100644 --- a/image/test/mochitest/chrome.ini +++ b/image/test/mochitest/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = animated-gif-finalframe.gif animated-gif.gif diff --git a/js/xpconnect/tests/chrome/chrome.ini b/js/xpconnect/tests/chrome/chrome.ini index a6bdee3c7ee..6d09d32f7ac 100644 --- a/js/xpconnect/tests/chrome/chrome.ini +++ b/js/xpconnect/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = bug503926.xul file_bug618176.xul diff --git a/layout/base/tests/chrome/chrome.ini b/layout/base/tests/chrome/chrome.ini index afe7db848d6..7c6b4816348 100644 --- a/layout/base/tests/chrome/chrome.ini +++ b/layout/base/tests/chrome/chrome.ini @@ -1,4 +1,5 @@ [DEFAULT] +skip-if = os == 'android' support-files = animated.gif blue-32x32.png diff --git a/layout/forms/test/chrome.ini b/layout/forms/test/chrome.ini index 1a9bac3ac06..9a977e724ed 100644 --- a/layout/forms/test/chrome.ini +++ b/layout/forms/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = bug536567_iframe.html bug536567_subframe.html diff --git a/layout/generic/test/chrome.ini b/layout/generic/test/chrome.ini index 25af1ee2b9e..a92efe4ef3d 100644 --- a/layout/generic/test/chrome.ini +++ b/layout/generic/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = file_bug514732_window.xul frame_selection_underline-ref.xhtml diff --git a/layout/inspector/tests/chrome/chrome.ini b/layout/inspector/tests/chrome/chrome.ini index ce80f459234..4b2139fe047 100644 --- a/layout/inspector/tests/chrome/chrome.ini +++ b/layout/inspector/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = GentiumPlus-R.woff [test_bug467669.css] diff --git a/layout/style/test/chrome/chrome.ini b/layout/style/test/chrome/chrome.ini index 61f0244e693..e84b9833921 100644 --- a/layout/style/test/chrome/chrome.ini +++ b/layout/style/test/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = bug418986-2.js bug535806-css.css diff --git a/layout/xul/test/chrome.ini b/layout/xul/test/chrome.ini index 0dfa1da3190..a3b151e0163 100644 --- a/layout/xul/test/chrome.ini +++ b/layout/xul/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = window_resizer.xul window_resizer_element.xul diff --git a/security/manager/ssl/tests/mochitest/bugs/chrome.ini b/security/manager/ssl/tests/mochitest/bugs/chrome.ini index 488afecb11c..fc371b5a04c 100644 --- a/security/manager/ssl/tests/mochitest/bugs/chrome.ini +++ b/security/manager/ssl/tests/mochitest/bugs/chrome.ini @@ -1,6 +1,6 @@ [DEFAULT] tags = psm -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' [test_bug413909.html] skip-if = buildapp == 'mulet' diff --git a/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini b/security/manager/ssl/tests/mochitest/stricttransportsecurity/chrome.ini index 6cfb42f565a..f321a44cd2f 100644 --- 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] diff --git a/services/fxaccounts/tests/mochitest/chrome.ini b/services/fxaccounts/tests/mochitest/chrome.ini index a099bf9d129..777cd496f28 100644 --- a/services/fxaccounts/tests/mochitest/chrome.ini +++ b/services/fxaccounts/tests/mochitest/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files= file_invalidEmailCase.sjs diff --git a/testing/mochitest/chrome/chrome.ini b/testing/mochitest/chrome/chrome.ini index 6e06dadb2e7..bcc9b2cfab6 100644 --- a/testing/mochitest/chrome/chrome.ini +++ b/testing/mochitest/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = test-dir/test-file [test_sample.xul] diff --git a/toolkit/components/aboutmemory/tests/chrome.ini b/toolkit/components/aboutmemory/tests/chrome.ini index f920a9bfd0b..004c0ae0dcd 100644 --- a/toolkit/components/aboutmemory/tests/chrome.ini +++ b/toolkit/components/aboutmemory/tests/chrome.ini @@ -1,5 +1,5 @@ [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 diff --git a/toolkit/components/ctypes/tests/chrome/chrome.ini b/toolkit/components/ctypes/tests/chrome/chrome.ini index 9a67fc1dcac..b71ba47f87a 100644 --- a/toolkit/components/ctypes/tests/chrome/chrome.ini +++ b/toolkit/components/ctypes/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = xpcshellTestHarnessAdaptor.js ctypes_worker.js diff --git a/toolkit/components/osfile/tests/mochi/chrome.ini b/toolkit/components/osfile/tests/mochi/chrome.ini index 8fdab988c3c..c51136bb76a 100644 --- a/toolkit/components/osfile/tests/mochi/chrome.ini +++ b/toolkit/components/osfile/tests/mochi/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = main_test_osfile_async.js worker_handler.js diff --git a/toolkit/components/passwordmgr/test/chrome.ini b/toolkit/components/passwordmgr/test/chrome.ini index 7530842ae7e..8978aabce4a 100644 --- a/toolkit/components/passwordmgr/test/chrome.ini +++ b/toolkit/components/passwordmgr/test/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = formsubmit.sjs notification_common.js diff --git a/toolkit/components/url-classifier/tests/mochitest/chrome.ini b/toolkit/components/url-classifier/tests/mochitest/chrome.ini index 0bfc84f14b2..d193953545a 100644 --- a/toolkit/components/url-classifier/tests/mochitest/chrome.ini +++ b/toolkit/components/url-classifier/tests/mochitest/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = allowlistAnnotatedFrame.html classifiedAnnotatedFrame.html diff --git a/toolkit/content/tests/chrome/chrome.ini b/toolkit/content/tests/chrome/chrome.ini index 364ddea965c..7b10838053d 100644 --- a/toolkit/content/tests/chrome/chrome.ini +++ b/toolkit/content/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = ../widgets/popup_shared.js ../widgets/tree_shared.js diff --git a/toolkit/content/tests/widgets/chrome.ini b/toolkit/content/tests/widgets/chrome.ini index 8792a342cf5..0db68795040 100644 --- a/toolkit/content/tests/widgets/chrome.ini +++ b/toolkit/content/tests/widgets/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = tree_shared.js popup_shared.js diff --git a/toolkit/devtools/qrcode/tests/mochitest/chrome.ini b/toolkit/devtools/qrcode/tests/mochitest/chrome.ini index 9c26e49223d..f73f845e743 100644 --- 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] diff --git a/toolkit/devtools/server/tests/mochitest/chrome.ini b/toolkit/devtools/server/tests/mochitest/chrome.ini index 23c7c85008d..4350d14097d 100644 --- a/toolkit/devtools/server/tests/mochitest/chrome.ini +++ b/toolkit/devtools/server/tests/mochitest/chrome.ini @@ -1,6 +1,6 @@ [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 diff --git a/toolkit/devtools/tests/mochitest/chrome.ini b/toolkit/devtools/tests/mochitest/chrome.ini index 214f69ffdc8..6194c48f717 100644 --- a/toolkit/devtools/tests/mochitest/chrome.ini +++ b/toolkit/devtools/tests/mochitest/chrome.ini @@ -1,6 +1,6 @@ [DEFAULT] tags = devtools -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' [test_eventemitter_basic.html] [test_devtools_extensions.html] diff --git a/toolkit/identity/tests/chrome/chrome.ini b/toolkit/identity/tests/chrome/chrome.ini index ff3759c21e1..ffaff0fb185 100644 --- a/toolkit/identity/tests/chrome/chrome.ini +++ b/toolkit/identity/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = sandbox_content.html sandbox_content.sjs diff --git a/toolkit/mozapps/downloads/tests/chrome/chrome.ini b/toolkit/mozapps/downloads/tests/chrome/chrome.ini index a675451fb3a..15bdf126dd2 100644 --- a/toolkit/mozapps/downloads/tests/chrome/chrome.ini +++ b/toolkit/mozapps/downloads/tests/chrome/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = unknownContentType_dialog_layout_data.pif unknownContentType_dialog_layout_data.pif^headers^ diff --git a/toolkit/webapps/tests/chrome.ini b/toolkit/webapps/tests/chrome.ini index d96731ce6b0..0f05befaf98 100644 --- a/toolkit/webapps/tests/chrome.ini +++ b/toolkit/webapps/tests/chrome.ini @@ -1,5 +1,5 @@ [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 diff --git a/widget/tests/chrome.ini b/widget/tests/chrome.ini index 456752586ae..9dfba0f7e30 100644 --- a/widget/tests/chrome.ini +++ b/widget/tests/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = buildapp == 'b2g' +skip-if = buildapp == 'b2g' || os == 'android' support-files = empty_window.xul utils.js diff --git a/xpfe/appshell/test/chrome.ini b/xpfe/appshell/test/chrome.ini index 7b8193fe82b..81b37385c2f 100644 --- 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]