diff --git a/dom/browser-element/mochitest/chrome.ini b/dom/browser-element/mochitest/chrome.ini index 022165f6a500..02f228be9c70 100644 --- a/dom/browser-element/mochitest/chrome.ini +++ b/dom/browser-element/mochitest/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] -skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s +skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s || toolkit == 'android' # Bug 1287720: takes too long on android support-files = audio.ogg diff --git a/dom/contacts/tests/chrome.ini b/dom/contacts/tests/chrome.ini index 798b28646470..01553d3a63dc 100644 --- a/dom/contacts/tests/chrome.ini +++ b/dom/contacts/tests/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] - +skip-if = toolkit == 'android' # Bug 1287455: takes too long to complete on Android support-files = shared.js file_contacts_basics.html @@ -20,11 +20,11 @@ support-files = # did opened the database. those should really be xpcshell and not chrome # mochitests maybe ... [test_contacts_a_shutdown.xul] -skip-if = os == "android" || buildapp == 'b2g' +skip-if = buildapp == 'b2g' [test_contacts_a_upgrade.xul] -skip-if = os == "android" || buildapp == 'b2g' +skip-if = buildapp == 'b2g' [test_contacts_a_cache.xul] -skip-if = os == "android" || buildapp == 'b2g' +skip-if = buildapp == 'b2g' [test_contacts_basics.html] skip-if = (toolkit == 'gonk' && debug) #debug-only failure [test_contacts_basics2.html] @@ -42,4 +42,3 @@ skip-if = (toolkit == 'gonk' && debug) #debug-only failure [test_contacts_substringmatchingCL.html] [test_migration.html] support-files += - skip-if = os == "android" diff --git a/dom/settings/tests/chrome.ini b/dom/settings/tests/chrome.ini index ba8624dac608..92b1554a00aa 100644 --- a/dom/settings/tests/chrome.ini +++ b/dom/settings/tests/chrome.ini @@ -1,4 +1,5 @@ [DEFAULT] +skip-if = toolkit == 'android' # Bug 1287455: takes too long to complete on Android support-files = file_loadserver.js file_bug1110872.js diff --git a/dom/tests/mochitest/notification/chrome.ini b/dom/tests/mochitest/notification/chrome.ini index 2f6b3b4932d1..171745999a7a 100644 --- a/dom/tests/mochitest/notification/chrome.ini +++ b/dom/tests/mochitest/notification/chrome.ini @@ -1,5 +1,5 @@ [DEFAULT] - +skip-if = toolkit == 'android' # Bug 1287455: takes too long to complete on Android support-files = MockServices.js NotificationTest.js diff --git a/dom/tv/test/mochitest/chrome.ini b/dom/tv/test/mochitest/chrome.ini index 02c214efb20d..05c2bb78581a 100644 --- a/dom/tv/test/mochitest/chrome.ini +++ b/dom/tv/test/mochitest/chrome.ini @@ -1,4 +1,5 @@ [DEFAULT] +skip-if = toolkit == 'android' # Bug 1287455: takes too long to complete on Android support-files = head.js mock_data.json