Bug 668349 - changes to xpcshell.ini; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Wed, 10 Aug 2011 16:56:49 -0400
changeset 74227 187ac0d7b1540c0b512564a2a79eb2936d6774a1
parent 74226 40e392d958e0c4146d3dcc28d954b5e50efcf5a1
child 74228 d9456378c12dfd57040e4d58710fa2c9f9274839
push id2
push userbsmedberg@mozilla.com
push dateFri, 19 Aug 2011 14:38:13 +0000
reviewersjmaher
bugs668349
milestone8.0a1
Bug 668349 - changes to xpcshell.ini; r=jmaher
dom/plugins/test/unit/xpcshell.ini
embedding/tests/unit/xpcshell.ini
intl/uconv/tests/unit/xpcshell.ini
ipc/testshell/tests/xpcshell.ini
js/src/xpconnect/tests/unit/xpcshell.ini
modules/libpr0n/test/unit/xpcshell.ini
netwerk/test/unit/xpcshell.ini
security/manager/ssl/tests/unit/xpcshell.ini
services/crypto/tests/unit/xpcshell.ini
services/sync/tests/unit/xpcshell.ini
storage/test/unit/xpcshell.ini
testing/xpcshell/xpcshell.ini
toolkit/components/ctypes/tests/unit/xpcshell.ini
toolkit/components/downloads/test/unit/xpcshell.ini
toolkit/components/places/tests/autocomplete/xpcshell.ini
toolkit/components/places/tests/expiration/xpcshell.ini
toolkit/components/places/tests/queries/xpcshell.ini
toolkit/components/places/tests/unit/xpcshell.ini
toolkit/components/satchel/test/unit/xpcshell.ini
toolkit/components/telemetry/tests/unit/xpcshell.ini
toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
toolkit/mozapps/update/test_timermanager/unit/xpcshell.ini
uriloader/exthandler/tests/unit/xpcshell.ini
uriloader/exthandler/tests/unit_ipc/xpcshell.ini
xpcom/tests/unit/xpcshell.ini
--- a/dom/plugins/test/unit/xpcshell.ini
+++ b/dom/plugins/test/unit/xpcshell.ini
@@ -1,6 +1,10 @@
 [DEFAULT]
 head = head_plugins.js
 tail = 
 
 [test_bug455213.js]
+# Bug 676953: test fails consistently on Android
+fail-if = os == "android"
 [test_bug471245.js]
+# Bug 676953: test fails consistently on Android
+fail-if = os == "android"
--- a/embedding/tests/unit/xpcshell.ini
+++ b/embedding/tests/unit/xpcshell.ini
@@ -1,6 +1,10 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_wwauthpromptfactory.js]
+# Bug 676955: test fails consistently on Android
+fail-if = os == "android"
 [test_wwpromptfactory.js]
+# Bug 676955: test fails consistently on Android
+fail-if = os == "android"
--- a/intl/uconv/tests/unit/xpcshell.ini
+++ b/intl/uconv/tests/unit/xpcshell.ini
@@ -106,16 +106,18 @@ tail =
 [test_encode_CP1255.js]
 [test_encode_CP1256.js]
 [test_encode_CP1257.js]
 [test_encode_CP1258.js]
 [test_encode_CP850.js]
 [test_encode_CP852.js]
 [test_encode_CP855.js]
 [test_encode_CP857.js]
+# Bug 676958: test consistently hangs on Android
+skip-if = os == "android"
 [test_encode_CP862.js]
 [test_encode_CP864.js]
 [test_encode_CP874.js]
 [test_encode_armscii.js]
 [test_encode_geostd8.js]
 [test_encode_gbk.js]
 [test_encode_tcvn5712.js]
 [test_encode_utf-7_internal.js]
--- a/ipc/testshell/tests/xpcshell.ini
+++ b/ipc/testshell/tests/xpcshell.ini
@@ -1,6 +1,8 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_ipcshell.js]
+# Bug 676963: test fails consistently on Android
+fail-if = os = "android"
 [test_ipcshell_child.js]
--- a/js/src/xpconnect/tests/unit/xpcshell.ini
+++ b/js/src/xpconnect/tests/unit/xpcshell.ini
@@ -9,11 +9,13 @@ tail =
 [test_bug604362.js]
 [test_bug608142.js]
 [test_bug641378.js]
 [test_bug_442086.js]
 [test_file.js]
 [test_import.js]
 [test_js_weak_references.js]
 [test_localeCompare.js]
+# Bug 676965: test fails consistently on Android
+fail-if = os == "android"
 [test_recursive_import.js]
 [test_xpcomutils.js]
 [test_unload.js]
--- a/modules/libpr0n/test/unit/xpcshell.ini
+++ b/modules/libpr0n/test/unit/xpcshell.ini
@@ -3,9 +3,11 @@ head =
 tail = 
 
 [test_async_notification.js]
 [test_async_notification_404.js]
 [test_async_notification_animated.js]
 [test_encoder_apng.js]
 [test_encoder_png.js]
 [test_imgtools.js]
+# Bug 676968: test fails consistently on Android
+fail-if = os == "android"
 [test_moz_icon_uri.js]
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -3,16 +3,18 @@ head = head_channels.js
 tail = 
 
 [test_307_redirect.js]
 [test_NetUtil.js]
 [test_URIs.js]
 [test_aboutblank.js]
 [test_auth_proxy.js]
 [test_authentication.js]
+# Bug 675039: test hangs consistently on Android
+skip-if = os == "android"
 [test_authpromptwrapper.js]
 [test_bug203271.js]
 [test_bug248970_cache.js]
 [test_bug248970_cookie.js]
 [test_bug261425.js]
 [test_bug263127.js]
 [test_bug321706.js]
 [test_bug331825.js]
@@ -33,44 +35,58 @@ tail =
 [test_bug412945.js]
 [test_bug414122.js]
 [test_bug419157.js]
 [test_bug427957.js]
 [test_bug429347.js]
 [test_bug455311.js]
 [test_bug455598.js]
 [test_bug468426.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_bug468594.js]
 [test_bug470716.js]
 [test_bug479413.js]
 [test_bug479485.js]
 [test_bug482601.js]
 [test_bug484684.js]
 [test_bug490095.js]
 [test_bug504014.js]
 [test_bug510359.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_bug515583.js]
 [test_bug528292.js]
 [test_bug540566.js]
 [test_bug543805.js]
 [test_bug553970.js]
 [test_bug561042.js]
 [test_bug561276.js]
 [test_bug580508.js]
 [test_bug586908.js]
 [test_bug588389.js]
 [test_bug596443.js]
 [test_bug618835.js]
 [test_bug633743.js]
 [test_bug650955.js]
+# Bug 677427: test fails consistently on Android
+fail-if = os == "android"
 [test_bug652761.js]
 [test_bug651100.js]
+# Bug 675044: test fails consistently on Android
+fail-if = os == "android"  
 [test_bug654926.js]
+# Bug 675049: test fails consistently on Android
+fail-if = os == "android"  
 [test_bug654926_doom_and_read.js]
+# Bug 675049: test fails consistently on Android
+fail-if = os == "android"  
 [test_bug654926_test_seek.js]
+# Bug 675049: test fails consistently on Android
+fail-if = os == "android"  
 [test_bug659569.js]
 [test_bug660066.js]
 [test_bug651185.js]
 [test_bug667907.js]
 [test_bug670333.js]
 [test_bug667818.js]
 [test_cacheflags.js]
 [test_channel_close.js]
@@ -78,23 +94,39 @@ tail =
 [test_content_sniffer.js]
 [test_cookie_header.js]
 [test_data_protocol.js]
 [test_dns_service.js]
 [test_duplicate_headers.js]
 [test_event_sink.js]
 [test_extract_charset_from_content_type.js]
 [test_fallback_no-cache-entry_canceled.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_fallback_no-cache-entry_passing.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_fallback_redirect-to-different-origin_canceled.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_fallback_redirect-to-different-origin_passing.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_fallback_request-error_canceled.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_fallback_request-error_passing.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_fallback_response-error_canceled.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_fallback_response-error_passing.js]
+# Bug 675039: test hangs consistently on Android 
+skip-if = os == "android"
 [test_file_partial_inputstream.js]
 [test_file_protocol.js]
 [test_filestreams.js]
 [test_gre_resources.js]
 [test_gzipped_206.js]
 [test_head.js]
 [test_http_headers.js]
 [test_httpcancel.js]
@@ -126,14 +158,16 @@ tail =
 [test_reentrancy.js]
 [test_reopen.js]
 [test_resumable_channel.js]
 [test_resumable_truncate.js]
 [test_safeoutputstream.js]
 [test_simple.js]
 [test_sockettransportsvc_available.js]
 [test_socks.js]
+# Bug 675039: test hangs consistently on Android
+skip-if = os == "android"
 [test_standardurl.js]
 [test_standardurl_port.js]
 [test_streamcopier.js]
 [test_traceable_channel.js]
 [test_unescapestring.js]
 [test_xmlhttprequest.js]
--- a/security/manager/ssl/tests/unit/xpcshell.ini
+++ b/security/manager/ssl/tests/unit/xpcshell.ini
@@ -1,7 +1,13 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_datasignatureverifier.js]
+# Bug 676972: test hangs consistently on Android
+skip-if = os == "android"
 [test_hash_algorithms.js]
+# Bug 676972: test hangs consistently on Android
+skip-if = os == "android"
 [test_hmac.js]
+# Bug 676972: test hangs consistently on Android
+skip-if = os == "android"
--- a/services/crypto/tests/unit/xpcshell.ini
+++ b/services/crypto/tests/unit/xpcshell.ini
@@ -1,7 +1,9 @@
 [DEFAULT]
 head = head_helpers.js
 tail = 
 
 [test_crypto_crypt.js]
 [test_crypto_deriveKey.js]
 [test_crypto_random.js]
+# Bug 676977: test hangs consistently on Android
+skip-if = os == "android"
--- a/services/sync/tests/unit/xpcshell.ini
+++ b/services/sync/tests/unit/xpcshell.ini
@@ -29,17 +29,18 @@ tail =
 [test_forms_tracker.js]
 [test_history_engine.js]
 [test_history_store.js]
 [test_history_tracker.js]
 [test_hmac_error.js]
 [test_interval_triggers.js]
 [test_jpakeclient.js]
 # Bug 618233: this test produces random failures on Windows 7.
-skip-if = os == "win"
+# Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
+skip-if = os == "win" || os == "android"
 [test_keys.js]
 [test_load_modules.js]
 [test_log4moz.js]
 [test_notifications.js]
 [test_password_store.js]
 [test_password_tracker.js]
 [test_places_guid_downgrade.js]
 [test_prefs_store.js]
@@ -55,44 +56,49 @@ skip-if = os == "win"
 [test_service_attributes.js]
 [test_service_changePassword.js]
 [test_service_checkAccount.js]
 [test_service_cluster.js]
 [test_service_createAccount.js]
 [test_service_detect_upgrade.js]
 [test_service_filelog.js]
 # Bug 664090: this test persistently fails on Windows opt builds.
-skip-if = os == "win" && !debug
+# Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
+skip-if = (os == "win" && !debug) || os == "android"
 [test_service_getStorageInfo.js]
 [test_service_login.js]
 [test_service_migratePrefs.js]
 [test_service_passwordUTF8.js]
 [test_service_persistLogin.js]
 [test_service_startOver.js]
 [test_service_startup.js]
 [test_service_sync_401.js]
 [test_service_sync_checkServerError.js]
 # Bug 604565: this test intermittently hangs on OS X debug builds.
-skip-if = os == "mac" && debug
+# Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
+skip-if = (os == "mac" && debug) || os == "android"
 [test_service_sync_locked.js]
 [test_service_sync_remoteSetup.js]
 # Bug 604565: this test intermittently hangs on OS X debug builds.
-skip-if = os == "mac" && debug
+# Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
+skip-if = (os == "mac" && debug) || os == "android"
 [test_service_sync_updateEnabledEngines.js]
 # Bug 604565: this test intermittently hangs on OS X debug builds.
-skip-if = os == "mac" && debug
+# Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
+skip-if = (os == "mac" && debug) || os == "android"
 [test_service_verifyLogin.js]
 [test_service_wipeClient.js]
 [test_service_wipeServer.js]
 [test_status.js]
 [test_status_checkSetup.js]
 [test_syncengine.js]
 [test_syncengine_sync.js]
 # Bug 604565: this test intermittently hangs on OS X debug builds.
-skip-if = os == "mac" && debug
+# Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
+skip-if = (os == "mac" && debug) || os == "android"
 [test_syncscheduler.js]
 [test_syncstoragerequest.js]
 [test_tab_engine.js]
 [test_tab_store.js]
 [test_tab_tracker.js]
 [test_tracker_addChanged.js]
 [test_upgrade_old_sync_key.js]
 [test_utils_asyncChain.js]
--- a/storage/test/unit/xpcshell.ini
+++ b/storage/test/unit/xpcshell.ini
@@ -2,16 +2,18 @@
 head = head_storage.js
 tail = 
 
 [test_bug-365166.js]
 [test_bug-393952.js]
 [test_bug-429521.js]
 [test_bug-444233.js]
 [test_chunk_growth.js]
+# Bug 676981: test fails consistently on Android
+fail-if = os == "android"
 [test_connection_executeAsync.js]
 [test_js_helpers.js]
 [test_levenshtein.js]
 [test_like.js]
 [test_like_escape.js]
 [test_locale_collation.js]
 [test_page_size_is_32k.js]
 [test_sqlite_secure_delete.js]
@@ -25,8 +27,10 @@ tail =
 [test_storage_service.js]
 [test_storage_service_unshared.js]
 [test_storage_statement.js]
 [test_storage_statement_wrapper.js]
 [test_storage_value_array.js]
 [test_unicode.js]
 [test_vacuum.js]
 [test_telemetry_vfs.js]
+# Bug 676981: test fails consistently on Android
+# fail-if = os == "android"
--- a/testing/xpcshell/xpcshell.ini
+++ b/testing/xpcshell/xpcshell.ini
@@ -10,16 +10,18 @@
 [include:dom/src/json/test/unit/xpcshell.ini]
 [include:dom/tests/unit/xpcshell.ini]
 [include:content/xtf/test/unit/xpcshell.ini]
 [include:docshell/test/unit/xpcshell.ini]
 [include:embedding/tests/unit/xpcshell.ini]
 [include:toolkit/components/commandlines/test/unit/xpcshell.ini]
 [include:toolkit/components/contentprefs/tests/unit/xpcshell.ini]
 [include:toolkit/components/passwordmgr/test/unit/xpcshell.ini]
+# Bug 676989: tests hang on Android
+skip-if = os == "android"
 [include:toolkit/components/places/tests/migration/xpcshell.ini]
 [include:toolkit/components/places/tests/autocomplete/xpcshell.ini]
 [include:toolkit/components/places/tests/expiration/xpcshell.ini]
 [include:toolkit/components/places/tests/sync/xpcshell.ini]
 [include:toolkit/components/places/tests/bookmarks/xpcshell.ini]
 [include:toolkit/components/places/tests/queries/xpcshell.ini]
 [include:toolkit/components/places/tests/unit/xpcshell.ini]
 [include:toolkit/components/places/tests/network/xpcshell.ini]
@@ -54,16 +56,18 @@
 [include:gfx/tests/unit/xpcshell.ini]
 [include:widget/tests/unit/xpcshell.ini]
 [include:content/base/test/unit/xpcshell.ini]
 [include:content/test/unit/xpcshell.ini]
 [include:toolkit/components/url-classifier/tests/unit/xpcshell.ini]
 [include:services/crypto/tests/unit/xpcshell.ini]
 [include:services/crypto/components/tests/unit/xpcshell.ini]
 [include:services/sync/tests/unit/xpcshell.ini]
+# Bug 676978: tests hang on Android 
+skip-if = os == "android"
 [include:browser/components/dirprovider/tests/unit/xpcshell.ini]
 [include:browser/components/feeds/test/unit/xpcshell.ini]
 [include:browser/components/places/tests/unit/xpcshell.ini]
 [include:browser/components/privatebrowsing/test/unit/xpcshell.ini]
 [include:browser/components/shell/test/unit/xpcshell.ini]
 [include:extensions/spellcheck/hunspell/tests/unit/xpcshell.ini]
 [include:toolkit/components/search/tests/xpcshell/xpcshell.ini]
 [include:toolkit/mozapps/shared/test/unit/xpcshell.ini]
--- a/toolkit/components/ctypes/tests/unit/xpcshell.ini
+++ b/toolkit/components/ctypes/tests/unit/xpcshell.ini
@@ -1,5 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_jsctypes.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
--- a/toolkit/components/downloads/test/unit/xpcshell.ini
+++ b/toolkit/components/downloads/test/unit/xpcshell.ini
@@ -6,18 +6,22 @@ tail =
 [test_bug_384744.js]
 [test_bug_395092.js]
 [test_bug_401430.js]
 [test_bug_401582.js]
 [test_bug_406857.js]
 [test_bug_409179.js]
 [test_bug_420230.js]
 [test_cancel_download_files_removed.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_download_manager.js]
 [test_download_samename.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android" 
 [test_history_expiration.js]
 [test_memory_db_support.js]
 [test_offline_support.js]
 [test_old_download_files_removed.js]
 [test_privatebrowsing.js]
 [test_privatebrowsing_cancel.js]
 [test_removeDownloadsByTimeframe.js]
 [test_resume.js]
--- a/toolkit/components/places/tests/autocomplete/xpcshell.ini
+++ b/toolkit/components/places/tests/autocomplete/xpcshell.ini
@@ -3,18 +3,24 @@ head = head_autocomplete.js
 tail = 
 
 [test_416211.js]
 [test_416214.js]
 [test_417798.js]
 [test_418257.js]
 [test_422277.js]
 [test_autocomplete_on_value_removed_479089.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_download_embed_bookmarks.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_empty_search.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_enabled.js]
 [test_escape_self.js]
 [test_ignore_protocol.js]
 [test_keyword_search.js]
 [test_livemarks.js]
 [test_match_beginning.js]
 [test_multi_word_search.js]
 [test_special_search.js]
--- a/toolkit/components/places/tests/expiration/xpcshell.ini
+++ b/toolkit/components/places/tests/expiration/xpcshell.ini
@@ -1,16 +1,26 @@
 [DEFAULT]
 head = head_expiration.js
 tail = 
 
 [test_analyze_runs.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_annos_expire_history.js]
 [test_annos_expire_never.js]
 [test_annos_expire_policy.js]
 [test_annos_expire_session.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_notifications.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_notifications_onDeleteURI.js]
 [test_notifications_onDeleteVisits.js]
 [test_pref_interval.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_pref_maxpages.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android" 
 [test_removeAllPages.js]
 [test_debug_expiration.js]
--- a/toolkit/components/places/tests/queries/xpcshell.ini
+++ b/toolkit/components/places/tests/queries/xpcshell.ini
@@ -8,17 +8,25 @@ tail =
 [test_async.js]
 [test_containersQueries_sorting.js]
 [test_excludeReadOnlyFolders.js]
 [test_history_queries_tags_liveUpdate.js]
 [test_history_queries_titles_liveUpdate.js]
 [test_onlyBookmarked.js]
 [test_querySerialization.js]
 [test_redirectsMode.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_results-as-tag-contents-query.js]
 [test_results-as-visit.js]
 [test_searchterms-domain.js]
 [test_searchterms-uri.js]
 [test_searchterms-bookmarklets.js]
 [test_sort-date-site-grouping.js]
 [test_sorting.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android" 
 [test_tags.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_transitions.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
--- a/toolkit/components/places/tests/unit/xpcshell.ini
+++ b/toolkit/components/places/tests/unit/xpcshell.ini
@@ -1,95 +1,131 @@
 [DEFAULT]
 head = head_bookmarks.js
 tail = 
 
 [test_000_frecency.js]
 [test_248970.js]
 [test_317472.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_331487.js]
 [test_385397.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_399264_query_to_string.js]
 [test_399264_string_to_query.js]
 [test_399266.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_399606.js]
 [test_402799.js]
 [test_404630.js]
 [test_405497.js]
 [test_408221.js]
 [test_412132.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_413784.js]
 [test_415460.js]
 [test_415757.js]
 [test_418643_removeFolderChildren.js]
 [test_419731.js]
 [test_419792_node_tags_property.js]
 [test_420331_wyciwyg.js]
 [test_421180.js]
 [test_425563.js]
 [test_429505_remove_shortcuts.js]
 [test_433317_query_title_update.js]
 [test_433525_hasChildren_crash.js]
 [test_451499.js]
 [test_452777.js]
 [test_454977.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_457698_crash.js]
 [test_463863.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_485442_crash_bug_nsNavHistoryQuery_GetUri.js]
 [test_486978_sort_by_date_queries.js]
 [test_536081.js]
 [test_adaptive.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_adaptive_bug527311.js]
 [test_annotations.js]
 [test_asyncExecuteLegacyQueries.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_async_history_api.js]
 [test_autocomplete_stopSearch_no_throw.js]
 [test_bookmark_catobs.js]
 [test_bookmarks_setNullTitle.js]
 [test_broken_folderShortcut_result.js]
 [test_browserhistory.js]
 [test_bug636917_isLivemark.js]
 [test_childlessTags.js]
 [test_crash_476292.js]
 [test_database_replaceOnStartup.js]
 [test_doSetAndLoadFaviconForPage.js]
 [test_doSetAndLoadFaviconForPage_failures.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_download_history.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_dynamic_containers.js]
 [test_exclude_livemarks.js]
 [test_faviconService_expireAllFavicons.js]
 [test_favicons.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_frecency.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_getChildIndex.js]
 [test_history.js]
 [test_history_autocomplete_tags.js]
 [test_history_catobs.js]
 [test_history_notifications.js]
 [test_history_observer.js]
 [test_history_removeAllPages.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_history_sidebar.js]
 [test_isvisited.js]
 [test_lastModified.js]
 [test_livemarkService_getLivemarkIdForFeedURI.js]
 [test_markpageas.js]
 [test_moz-anno_favicon_mime_type.js]
 [test_multi_queries.js]
+# Bug 676989: test fails consistently on Android
+fail-if = os == "android"
 [test_multi_word_tags.js]
 [test_nsINavHistoryViewer.js]
 [test_null_interfaces.js]
 [test_onBeforeDeleteURI_observer.js]
 [test_onItemChanged_tags.js]
 [test_placeURIs.js]
 [test_preventive_maintenance.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_preventive_maintenance_checkAndFixDatabase.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_preventive_maintenance_console.js]
 [test_removeVisitsByTimeframe.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_resolveNullBookmarkTitles.js]
 [test_result_sort.js]
 [test_sql_guid_functions.js]
 [test_tag_autocomplete_search.js]
 [test_tagging.js]
 [test_update_frecency_after_delete.js]
+# Bug 676989: test hangs consistently on Android
+skip-if = os == "android"
 [test_utils_backups_create.js]
 [test_utils_getURLsForContainerNode.js]
 [test_utils_setAnnotationsFor.js]
 [test_PlacesUtils_asyncGetBookmarkIds.js]
 [test_telemetry.js]
--- a/toolkit/components/satchel/test/unit/xpcshell.ini
+++ b/toolkit/components/satchel/test/unit/xpcshell.ini
@@ -1,14 +1,16 @@
 [DEFAULT]
 head = head_satchel.js
 tail = 
 
 [test_autocomplete.js]
 [test_bug_248970.js]
+# Bug 676989: test hangs on Android
+skip-if = os == "android"
 [test_db_corrupt.js]
 [test_db_update_v1.js]
 [test_db_update_v1b.js]
 [test_db_update_v2.js]
 [test_db_update_v2b.js]
 [test_db_update_v3.js]
 [test_db_update_v3b.js]
 [test_db_update_v999a.js]
--- a/toolkit/components/telemetry/tests/unit/xpcshell.ini
+++ b/toolkit/components/telemetry/tests/unit/xpcshell.ini
@@ -1,6 +1,8 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_nsITelemetry.js]
 [test_TelemetryPing.js]
+# Bug 676989: test fails consistently on Android
+# fail-if = os == "android"
--- a/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+++ b/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
@@ -1,75 +1,141 @@
 [DEFAULT]
 head = head_addons.js
 tail = 
 
 [test_AddonRepository.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_AddonRepository_cache.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_LightweightThemeManager.js]
 [test_badschema.js]
 [test_blocklistchange.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bootstrap.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug299716.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug299716_2.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug324121.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug335238.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug371495.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug384052.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug393285.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug394300.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug397778.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug406118.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug424262.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug425657.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug430120.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug449027.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug455906.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug465190.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug468528.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug470377_1.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug470377_2.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug470377_3.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug470377_4.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug514327_1.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug514327_2.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug514327_3.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_bug521905.js]
 [test_bug526598.js]
 [test_bug541420.js]
 [test_bug542391.js]
 [test_bug554133.js]
 [test_bug559800.js]
 [test_bug563256.js]
+# Bug 676992: test consistently fails on Android
+fail-if = os == "android"
 [test_bug564030.js]
 [test_bug566626.js]
 [test_bug567184.js]
 [test_bug569138.js]
 [test_bug570173.js]
 [test_bug576735.js]
 [test_bug578467.js]
 [test_bug587088.js]
 [test_bug594058.js]
 [test_bug595081.js]
 [test_bug595573.js]
 [test_bug596607.js]
 [test_bug616841.js]
+# Bug 676992: test consistently fails on Android
+fail-if = os == "android"
 [test_bug619730.js]
 [test_bug620837.js]
 [test_bug655254.js]
 [test_bug659772.js]
 [test_cacheflush.js]
 [test_checkcompatibility.js]
 [test_corrupt.js]
 [test_disable.js]
 [test_distribution.js]
 [test_dss.js]
+# Bug 676992: test consistently fails on Android
+fail-if = os == "android"
 [test_duplicateplugins.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_error.js]
 [test_filepointer.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_fuel.js]
 [test_general.js]
 [test_getresource.js]
 [test_gfxBlacklist_AllOS1.js]
 [test_gfxBlacklist_AllOS2.js]
 [test_gfxBlacklist_Device.js]
 [test_gfxBlacklist_DriverNew.js]
 [test_gfxBlacklist_Equal_DriverNew.js]
@@ -77,28 +143,44 @@ tail =
 [test_gfxBlacklist_Equal_OK.js]
 [test_gfxBlacklist_GTE_DriverOld.js]
 [test_gfxBlacklist_GTE_OK.js]
 [test_gfxBlacklist_OK.js]
 [test_gfxBlacklist_OS.js]
 [test_gfxBlacklist_Vendor.js]
 [test_gfxBlacklist_prefs.js]
 [test_install.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_locale.js]
 [test_locked.js]
 [test_manifest.js]
 [test_migrate1.js]
 [test_migrate2.js]
 [test_migrate3.js]
 [test_permissions.js]
 [test_plugins.js]
+# Bug 676992: test consistently fails on Android
+fail-if = os == "android"
 [test_registry.js]
 [test_safemode.js]
 [test_startup.js]
+# Bug 676992: test consistently fails on Android
+fail-if = os == "android"
 [test_targetPlatforms.js]
 [test_theme.js]
+# Bug 676992: test consistently fails on Android
+fail-if = os == "android"
 [test_types.js]
 [test_uninstall.js]
 [test_update.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_updatecheck.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_updateid.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 [test_upgrade.js]
+# Bug 676992: test consistently hangs on Android
+skip-if = os == "android"
 
--- a/toolkit/mozapps/update/test_timermanager/unit/xpcshell.ini
+++ b/toolkit/mozapps/update/test_timermanager/unit/xpcshell.ini
@@ -1,5 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_0010_timermanager.js]
+# Bug 676992: test consistently fails on Android
+fail-if = os == "android"
--- a/uriloader/exthandler/tests/unit/xpcshell.ini
+++ b/uriloader/exthandler/tests/unit/xpcshell.ini
@@ -1,8 +1,10 @@
 [DEFAULT]
 head = head_handlerService.js
 tail = tail_handlerService.js
 
 [test_getTypeFromExtension_ext_to_type_mapping.js]
 [test_getTypeFromExtension_with_empty_Content_Type.js]
 [test_handlerService.js]
+# Bug 676997: test consistently fails on Android
+fail-if = os == "android"
 [test_punycodeURIs.js]
--- a/uriloader/exthandler/tests/unit_ipc/xpcshell.ini
+++ b/uriloader/exthandler/tests/unit_ipc/xpcshell.ini
@@ -1,5 +1,7 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_encoding.js]
+# Bug 676995: test hangs consistently on Android
+skip-if = os == "android"
--- a/xpcom/tests/unit/xpcshell.ini
+++ b/xpcom/tests/unit/xpcshell.ini
@@ -1,30 +1,40 @@
 [DEFAULT]
 head = 
 tail = 
 
 [test_bug121341.js]
 [test_bug332389.js]
 [test_bug333505.js]
 [test_bug364285-1.js]
+# Bug 676998: test fails consistently on Android
+fail-if = os == "android"
 [test_bug374754.js]
 [test_bug476919.js]
+# Bug 676998: test fails consistently on Android
+fail-if = os == "android"
 [test_bug478086.js]
 [test_bug656331.js]
 [test_compmgr_warnings.js]
 [test_file_createUnique.js]
 [test_file_equality.js]
 [test_hidden_files.js]
 [test_home.js]
+# Bug 676998: test fails consistently on Android
+fail-if = os == "android"
 [test_iniProcessor.js]
 [test_ioutil.js]
 [test_localfile.js]
 [test_mac_bundle.js]
 [test_nsIMutableArray.js]
 [test_nsIProcess.js]
 [test_pipe.js]
 [test_storagestream.js]
 [test_streams.js]
 [test_stringstream.js]
 [test_symlinks.js]
+# Bug 676998: test fails consistently on Android
+fail-if = os == "android"
 [test_systemInfo.js]
+# Bug 676998: test fails consistently on Android
+fail-if = os == "android"
 [test_versioncomparator.js]