diff -r 000000000000 -r 6474c204b198 netwerk/test/unit/xpcshell.ini
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/netwerk/test/unit/xpcshell.ini	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,319 @@
+[DEFAULT]
+head = head_channels.js head_cache.js head_cache2.js
+tail =
+support-files =
+  data/image.png
+  data/system_root.lnk
+  data/test_psl.txt
+  data/test_readline1.txt
+  data/test_readline2.txt
+  data/test_readline3.txt
+  data/test_readline4.txt
+  data/test_readline5.txt
+  data/test_readline6.txt
+  data/test_readline7.txt
+  data/test_readline8.txt
+  data/signed_win.exe
+  socks_client_subprocess.js
+  test_link.desktop
+  test_link.url
+
+[test_cache2-01-basic.js]
+[test_cache2-01a-basic-readonly.js]
+[test_cache2-01b-basic-datasize.js]
+[test_cache2-01c-basic-hasmeta-only.js]
+[test_cache2-01d-basic-not-wanted.js]
+[test_cache2-02-open-non-existing.js]
+[test_cache2-03-oncacheentryavail-throws.js]
+[test_cache2-04-oncacheentryavail-throws2x.js]
+[test_cache2-05-visit.js]
+[test_cache2-06-pb-mode.js]
+# Bug 675039, comment 6: "The difference is that the memory cache is disabled in Armv6 builds."
+skip-if = os == "android"
+[test_cache2-07-visit-memory.js]
+# Bug 675039, comment 6: "The difference is that the memory cache is disabled in Armv6 builds."
+skip-if = os == "android"
+[test_cache2-08-evict-disk-by-memory-storage.js]
+[test_cache2-09-evict-disk-by-uri.js]
+[test_cache2-10-evict-direct.js]
+[test_cache2-10b-evict-direct-immediate.js]
+[test_cache2-11-evict-memory.js]
+# Bug 675039, comment 6: "The difference is that the memory cache is disabled in Armv6 builds."
+skip-if = os == "android"
+[test_cache2-12-evict-disk.js]
+# Bug 675039, comment 6: "The difference is that the memory cache is disabled in Armv6 builds."
+skip-if = os == "android"
+[test_cache2-13-evict-non-existing.js]
+[test_cache2-14-concurent-readers.js]
+[test_cache2-14b-concurent-readers-complete.js]
+[test_cache2-15-conditional-304.js]
+[test_cache2-16-conditional-200.js]
+[test_cache2-17-evict-all.js]
+[test_cache2-18-not-valid.js]
+[test_cache2-19-range-206.js]
+[test_cache2-20-range-200.js]
+[test_cache2-21-anon-storage.js]
+[test_cache2-22-anon-visit.js]
+[test_304_responses.js]
+# Bug 675039: test hangs on Android-armv6 
+skip-if = os == "android"
+[test_cacheForOfflineUse_no-store.js]
+[test_307_redirect.js]
+[test_NetUtil.js]
+[test_URIs.js]
+[test_aboutblank.js]
+[test_assoc.js]
+[test_auth_jar.js]
+[test_auth_proxy.js]
+[test_authentication.js]
+[test_authpromptwrapper.js]
+[test_backgroundfilesaver.js]
+[test_bug203271.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug248970_cache.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug248970_cookie.js]
+[test_bug261425.js]
+[test_bug263127.js]
+[test_bug282432.js]
+[test_bug321706.js]
+[test_bug331825.js]
+[test_bug336501.js]
+[test_bug337744.js]
+[test_bug365133.js]
+# Bug 675039: intermittent fail on Android-armv6
+#skip-if = os == "android"
+skip-if = "FTP channel implementation needs to migrate to the new cache backend API"
+[test_bug368702.js]
+[test_bug369787.js]
+[test_bug371473.js]
+[test_bug376660.js]
+[test_bug376844.js]
+[test_bug376865.js]
+[test_bug379034.js]
+[test_bug380994.js]
+[test_bug388281.js]
+[test_bug396389.js]
+[test_bug401564.js]
+[test_bug411952.js]
+[test_bug412945.js]
+[test_bug414122.js]
+[test_bug427957.js]
+[test_bug429347.js]
+[test_bug455311.js]
+[test_bug455598.js]
+[test_bug468426.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug468594.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug470716.js]
+[test_bug477578.js]
+[test_bug479413.js]
+[test_bug479485.js]
+[test_bug482601.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug484684.js]
+# Bug 675039: intermittent fail on Android-armv6 
+#skip-if = os == "android"
+skip-if = "FTP channel implementation needs to migrate to the new cache backend API"
+[test_bug490095.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug504014.js]
+[test_bug510359.js]
+[test_bug515583.js]
+# Bug 675039: intermittent fail on Android-armv6 
+#skip-if = os == "android"
+skip-if = "FTP channel implementation needs to migrate to the new cache backend API"
+[test_bug528292.js]
+[test_bug536324_64bit_content_length.js]
+[test_bug540566.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug543805.js]
+# Bug 675039: intermittent fail on Android-armv6 
+#skip-if = os == "android"
+skip-if = "FTP channel implementation needs to migrate to the new cache backend API"
+[test_bug553970.js]
+[test_bug561042.js]
+# Bug 675039: test fails on Android 4.0
+skip-if = os == "android"
+[test_bug561276.js]
+[test_bug580508.js]
+[test_bug586908.js]
+[test_bug596443.js]
+# Bug 675039: intermittent fail on Android 
+skip-if = os == "android"
+[test_bug618835.js]
+[test_bug633743.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug650995.js]
+[test_bug652761.js]
+[test_bug651100.js]
+# Bug 675039: intermittent hang on Android-x86 
+skip-if = os == "android"
+[test_bug654926.js]
+[test_bug654926_doom_and_read.js]
+[test_bug654926_test_seek.js]
+[test_bug659569.js]
+[test_bug660066.js]
+[test_bug667907.js]
+[test_bug667818.js]
+[test_bug669001.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_bug712914_secinfo_validation.js]
+[test_bug770243.js]
+[test_bug894586.js]
+# Allocating 4GB might actually succeed on 64 bit machines
+skip-if = bits != 32
+[test_bug935499.js]
+[test_bug952927.js]
+[test_doomentry.js]
+[test_cacheflags.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_cache_jar.js]
+[test_channel_close.js]
+[test_compareURIs.js]
+[test_compressappend.js]
+[test_content_encoding_gzip.js]
+[test_content_sniffer.js]
+[test_cookie_header.js]
+[test_cookiejars.js]
+[test_cookiejars_safebrowsing.js]
+[test_data_protocol.js]
+[test_dns_service.js]
+[test_dns_localredirect.js]
+[test_dns_proxy_bypass.js]
+[test_duplicate_headers.js]
+[test_chunked_responses.js]
+[test_event_sink.js]
+[test_extract_charset_from_content_type.js]
+[test_force_sniffing.js]
+[test_fallback_no-cache-entry_canceled.js]
+[test_fallback_no-cache-entry_passing.js]
+[test_fallback_redirect-to-different-origin_canceled.js]
+[test_fallback_redirect-to-different-origin_passing.js]
+[test_fallback_request-error_canceled.js]
+[test_fallback_request-error_passing.js]
+[test_fallback_response-error_canceled.js]
+[test_fallback_response-error_passing.js]
+[test_file_partial_inputstream.js]
+[test_file_protocol.js]
+[test_filestreams.js]
+[test_freshconnection.js]
+[test_gre_resources.js]
+[test_gzipped_206.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_head.js]
+[test_header_Accept-Language.js]
+[test_headers.js]
+[test_http_headers.js]
+[test_httpauth.js]
+[test_httpcancel.js]
+[test_httpResponseTimeout.js]
+[test_httpsuspend.js]
+[test_idnservice.js]
+[test_idn_urls.js]
+[test_invalidport.js]
+[test_localstreams.js]
+[test_mismatch_last-modified.js]
+[test_MIME_params.js]
+[test_mozTXTToHTMLConv.js]
+[test_multipart_byteranges.js]
+[test_multipart_streamconv.js]
+[test_multipart_streamconv_missing_lead_boundary.js]
+[test_nestedabout_serialize.js]
+[test_net_addr.js]
+# Bug 732363: test fails on windows for unknown reasons.
+skip-if = os == "win"
+[test_nojsredir.js]
+[test_offline_status.js]
+[test_parse_content_type.js]
+[test_permmgr.js]
+[test_plaintext_sniff.js]
+[test_post.js]
+[test_private_necko_channel.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_private_cookie_changed.js]
+[test_progress.js]
+[test_protocolproxyservice.js]
+[test_proxy-failover_canceled.js]
+[test_proxy-failover_passing.js]
+[test_proxy-replace_canceled.js]
+[test_proxy-replace_passing.js]
+[test_psl.js]
+[test_range_requests.js]
+[test_readline.js]
+[test_redirect-caching_canceled.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_redirect-caching_failure.js]
+# Bug 675039: test fails consistently on Android
+fail-if = os == "android"
+[test_redirect-caching_passing.js]
+[test_redirect_canceled.js]
+[test_redirect_failure.js]
+# Bug 675039: test fails consistently on Android
+fail-if = os == "android"
+[test_redirect_from_script.js]
+[test_redirect_passing.js]
+[test_redirect_loop.js]
+[test_redirect_baduri.js]
+[test_redirect_different-protocol.js]
+[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 fails consistently on Android
+fail-if = os == "android"
+# spdy and http2 unit tests require us to have node available to run the spdy and http2 server
+[test_spdy.js]
+run-if = hasNode
+[test_http2.js]
+run-if = hasNode
+[test_speculative_connect.js]
+[test_standardurl.js]
+[test_standardurl_port.js]
+[test_streamcopier.js]
+[test_traceable_channel.js]
+[test_unescapestring.js]
+[test_xmlhttprequest.js]
+[test_XHR_redirects.js]
+[test_pinned_app_cache.js]
+[test_offlinecache_custom-directory.js]
+run-sequentially = Hardcoded hash value includes port 4444.
+[test_bug767025.js]
+run-sequentially = Hardcoded hash value includes port 4444.
+[test_bug826063.js]
+[test_bug812167.js]
+# Bug 675039: intermittent fail on Android-armv6 
+skip-if = os == "android"
+[test_tldservice_nextsubdomain.js]
+[test_about_protocol.js]
+[test_bug856978.js]
+[test_unix_domain.js]
+# The xpcshell temp directory on Android doesn't seem to let us create
+# Unix domain sockets. (Perhaps it's a FAT filesystem?)
+skip-if = os == "android"
+[test_addr_in_use_error.js]
+[test_about_networking.js]
+[test_ping_aboutnetworking.js]
+[test_referrer.js]
+[test_seer.js]
+skip-if = true
+[test_signature_extraction.js]
+run-if = os == "win"