diff -r 000000000000 -r 6474c204b198 js/xpconnect/tests/unit/xpcshell.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/xpconnect/tests/unit/xpcshell.ini	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,92 @@
+[DEFAULT]
+head =
+tail =
+support-files =
+  CatRegistrationComponents.manifest
+  bogus_element_type.jsm
+  bogus_exports_type.jsm
+  bug451678_subscript.js
+  component-blob.js
+  component-blob.manifest
+  component-file.js
+  component-file.manifest
+  component_import.js
+  component_import.manifest
+  importer.jsm
+  recursive_importA.jsm
+  recursive_importB.jsm
+  syntax_error.jsm
+
+[test_bogus_files.js]
+[test_bug408412.js]
+[test_bug451678.js]
+[test_bug604362.js]
+[test_bug641378.js]
+[test_bug677864.js]
+[test_bug711404.js]
+[test_bug778409.js]
+[test_bug780370.js]
+[test_bug805807.js]
+[test_bug809652.js]
+[test_bug809674.js]
+[test_bug813901.js]
+[test_bug845201.js]
+[test_bug845862.js]
+[test_bug849730.js]
+[test_bug851895.js]
+[test_bug854558.js]
+[test_bug868675.js]
+[test_bug867486.js]
+[test_bug872772.js]
+[test_bug885800.js]
+[test_bug961054.js]
+[test_bug976151.js]
+[test_bug1001094.js]
+[test_bug1021312.js]
+[test_bug1033920.js]
+[test_bug_442086.js]
+[test_file.js]
+[test_blob.js]
+[test_blob2.js]
+[test_file2.js]
+[test_import.js]
+[test_import_fail.js]
+[test_js_weak_references.js]
+[test_reflect_parse.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]
+[test_attributes.js]
+# Bug 676965: test fails consistently on Android
+fail-if = os == "android"
+[test_params.js]
+# Bug 676965: test fails consistently on Android
+fail-if = os == "android"
+[test_tearoffs.js]
+[test_want_components.js]
+[test_components.js]
+[test_allowedDomains.js]
+[test_allowedDomainsXHR.js]
+[test_nuke_sandbox.js]
+[test_sandbox_metadata.js]
+[test_exportFunction.js]
+[test_promise.js]
+[test_textDecoder.js]
+[test_url.js]
+[test_sandbox_atob.js]
+[test_isProxy.js]
+[test_getObjectPrincipal.js]
+[test_watchdog_enable.js]
+head = head_watchdog.js
+[test_watchdog_disable.js]
+head = head_watchdog.js
+[test_watchdog_toggle.js]
+head = head_watchdog.js
+[test_watchdog_default.js]
+head = head_watchdog.js
+[test_watchdog_hibernate.js]
+head = head_watchdog.js
+