Bug 978111: Enable already-working PSM xpcshell tests on Android and B2G, r=cviecco

--HG--
extra : rebase_source : c14ef67870f2b40a3319e6bc8df0ddfe9dd222e3

security/manager/ssl/tests/unit/xpcshell.ini

@@ -11,66 +11,61 @@ support-files =
   test_intermediate_basic_usage_constraints/**
   test_name_constraints/**
 
-[test_certificate_usages.js]
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
 [test_signed_apps.js]
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 978117: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_signed_apps-marketplace.js]
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 978117: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
+
 [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"
+
 [test_sts_preloadlist_perwindowpb.js]
 [test_sts_preloadlist_selfdestruct.js]
 [test_sts_holepunch.js]
+[test_sts_ipv4_ipv6.js]
+
+[test_certificate_usages.js]
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_ocsp_stapling.js]
 run-sequentially = hardcoded ports
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_ocsp_stapling_expired.js]
 run-sequentially = hardcoded ports
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_ocsp_stapling_with_intermediate.js]
 run-sequentially = hardcoded ports
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_ocsp_caching.js]
 run-sequentially = hardcoded ports
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_ocsp_required.js]
 run-sequentially = hardcoded ports
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
-[test_sts_ipv4_ipv6.js]
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_cert_signatures.js]
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_ev_certs.js]
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_getchain.js]
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_cert_overrides.js]
 run-sequentially = hardcoded ports
-# Bug 676972: test fails consistently on Android
-fail-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_intermediate_basic_usage_constraints.js]
-# Bug 676972: test hangs consistently on Android
-skip-if = os == "android"
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""
 [test_name_constraints.js]
-# Bug 676972: test hangs consistently on Android
-skip-if = os == "android"
-
-
+# Bug 676972: test fails consistently on Android and B2G
+fail-if = os == "android" || buildapp == "b2g""

testing/xpcshell/xpcshell_b2g.ini

@@ -16,3 +16,4 @@
 [include:toolkit/mozapps/update/tests/unit_timermanager/xpcshell.ini]
 [include:ipc/testshell/tests/xpcshell.ini]
 [include:b2g/components/test/unit/xpcshell.ini]
+[include:security/manager/ssl/tests/unit/xpcshell.ini]