Bug 1232582 - Sort PSM xpcshell.ini and fix --tag psm to actually run all tests. r=dkeeler

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

@@ -4,94 +4,37 @@ tail =
 tags = psm
 support-files =
   ocsp_common/**
+  test_cert_eku/**
+  test_cert_embedded_null/**
   test_cert_keyUsage/**
-  test_signed_apps/**
+  test_cert_sha1/**
-  tlsserver/**
   test_cert_signatures/**
+  test_cert_trust/**
+  test_cert_version/**
   test_certviewer_invalid_oids/**
   test_ev_certs/**
   test_getchain/**
   test_intermediate_basic_usage_constraints/**
-  test_name_constraints/**
-  test_cert_sha1/**
-  test_cert_trust/**
-  test_cert_version/**
-  test_cert_eku/**
-  test_cert_embedded_null/**
-  test_ocsp_url/**
-  test_ocsp_fetch_method/**
   test_keysize/**
   test_keysize_ev/**
-  test_pinning_dynamic/**
+  test_name_constraints/**
+  test_ocsp_fetch_method/**
+  test_ocsp_url/**
   test_onecrl/**
+  test_pinning_dynamic/**
+  test_signed_apps/**
   test_validity/**
+  tlsserver/**
 
-[test_datasignatureverifier.js]
+[test_add_preexisting_cert.js]
-[test_hash_algorithms.js]
-[test_hash_algorithms_wrap.js]
-# bug 1124289 - run_test_in_child violates the sandbox on b2g and android
-skip-if = toolkit == 'android' || toolkit == 'gonk'
-[test_hmac.js]
-
-[test_sts_preloadlist_perwindowpb.js]
-[test_sts_preloadlist_selfdestruct.js]
-[test_sts_holepunch.js]
-[test_sts_ipv4_ipv6.js]
-[test_sts_fqdn.js]
-
-[test_sss_eviction.js]
-[test_sss_readstate.js]
-[test_sss_readstate_child.js]
-support-files = sss_readstate_child_worker.js
-# bug 1124289 - run_test_in_child violates the sandbox on b2g and android
-skip-if = toolkit == 'android' || toolkit == 'gonk'
-[test_sss_readstate_empty.js]
-[test_sss_readstate_garbage.js]
-[test_sss_readstate_huge.js]
-[test_sss_savestate.js]
-
-[test_pinning_dynamic.js]
-[test_pinning_header_parsing.js]
-
-[test_cert_keyUsage.js]
-[test_logoutAndTeardown.js]
-run-sequentially = hardcoded ports
-[test_ocsp_stapling.js]
-run-sequentially = hardcoded ports
 [test_cert_blocklist.js]
 skip-if = buildapp == "b2g"
-tags = addons
+tags = addons psm
-[test_ocsp_stapling_expired.js]
+[test_cert_chains.js]
 run-sequentially = hardcoded ports
-skip-if = (toolkit == 'gonk' && debug) # Bug 1029775
+[test_cert_eku-CA.js]
-[test_ocsp_stapling_with_intermediate.js]
-run-sequentially = hardcoded ports
-[test_ocsp_caching.js]
-run-sequentially = hardcoded ports
-[test_ocsp_required.js]
-run-sequentially = hardcoded ports
-[test_ocsp_timeout.js]
-run-sequentially = hardcoded ports
-[test_cert_signatures.js]
-[test_ev_certs.js]
-run-sequentially = hardcoded ports
-[test_getchain.js]
-[test_cert_overrides.js]
-run-sequentially = hardcoded ports
-[test_cert_override_bits_mismatches.js]
-run-sequentially = hardcoded ports
-[test_intermediate_basic_usage_constraints.js]
-[test_name_constraints.js]
-[test_cert_trust.js]
-[test_cert_version.js]
-[test_signed_apps.js]
-[test_signed_apps-marketplace.js]
-[test_signed_dir.js]
-tags = addons
-
 [test_cert_eku-CA_EP.js]
 [test_cert_eku-CA_EP_NS_OS_SA_TS.js]
-[test_cert_eku-CA.js]
 [test_cert_eku-CA_NS.js]
 [test_cert_eku-CA_OS.js]
 [test_cert_eku-CA_SA.js]
@@ -112,22 +55,42 @@ tags = addons
 [test_cert_eku-SA.js]
 [test_cert_eku-SA_TS.js]
 [test_cert_eku-TS.js]
-
 [test_cert_embedded_null.js]
-
+[test_cert_keyUsage.js]
-[test_cert_sha1.js]
+[test_cert_overrides.js]
-
-[test_pinning.js]
 run-sequentially = hardcoded ports
-# This test can take longer than 300 seconds on B2G emulator debug builds, so
+[test_cert_override_bits_mismatches.js]
-# give it enough time to finish. See bug 1081128.
+run-sequentially = hardcoded ports
-requesttimeoutfactor = 2
+[test_cert_sha1.js]
-[test_ocsp_url.js]
+[test_cert_signatures.js]
+[test_cert_trust.js]
+[test_cert_version.js]
+[test_certviewer_invalid_oids.js]
+skip-if = toolkit == 'android' || buildapp == 'b2g'
+[test_constructX509FromBase64.js]
+[test_datasignatureverifier.js]
+[test_ev_certs.js]
+run-sequentially = hardcoded ports
+[test_getchain.js]
+[test_hash_algorithms.js]
+[test_hash_algorithms_wrap.js]
+# bug 1124289 - run_test_in_child violates the sandbox on b2g and android
+skip-if = toolkit == 'android' || toolkit == 'gonk'
+[test_hmac.js]
+[test_intermediate_basic_usage_constraints.js]
+[test_keysize.js]
+[test_keysize_ev.js]
 # OCSP requests in this test time out on slow B2G Emulator debug builds.
-# See Bug 1147725.
+# See Bug 1147726.
-# This test also fails on B2G Emulator opt builds non-reproducibly.
+skip-if = toolkit == 'gonk' && debug
-# See Bug 1178988.
+run-sequentially = hardcoded ports
-skip-if = toolkit == 'gonk'
+[test_logoutAndTeardown.js]
+run-sequentially = hardcoded ports
+[test_name_constraints.js]
+[test_nsCertType.js]
+run-sequentially = hardcoded ports
+[test_nsIX509Cert_utf8.js]
+[test_ocsp_caching.js]
 run-sequentially = hardcoded ports
 [test_ocsp_fetch_method.js]
 # OCSP requests in this test time out on slow B2G Emulator debug builds.
@@ -136,23 +99,51 @@ skip-if = toolkit == 'gonk' && debug
 run-sequentially = hardcoded ports
 [test_ocsp_no_hsts_upgrade.js]
 run-sequentially = hardcoded ports
-[test_add_preexisting_cert.js]
+[test_ocsp_required.js]
-[test_keysize.js]
+run-sequentially = hardcoded ports
-[test_keysize_ev.js]
+[test_ocsp_stapling.js]
+run-sequentially = hardcoded ports
+[test_ocsp_stapling_expired.js]
+run-sequentially = hardcoded ports
+skip-if = (toolkit == 'gonk' && debug) # Bug 1029775
+[test_ocsp_stapling_with_intermediate.js]
+run-sequentially = hardcoded ports
+[test_ocsp_timeout.js]
+run-sequentially = hardcoded ports
+[test_ocsp_url.js]
 # OCSP requests in this test time out on slow B2G Emulator debug builds.
-# See Bug 1147726.
+# See Bug 1147725.
-skip-if = toolkit == 'gonk' && debug
+# This test also fails on B2G Emulator opt builds non-reproducibly.
+# See Bug 1178988.
+skip-if = toolkit == 'gonk'
 run-sequentially = hardcoded ports
-[test_cert_chains.js]
+[test_pinning.js]
 run-sequentially = hardcoded ports
-[test_nsCertType.js]
+# This test can take longer than 300 seconds on B2G emulator debug builds, so
-run-sequentially = hardcoded ports
+# give it enough time to finish. See bug 1081128.
-[test_nsIX509Cert_utf8.js]
+requesttimeoutfactor = 2
-[test_constructX509FromBase64.js]
+[test_pinning_dynamic.js]
+[test_pinning_header_parsing.js]
+[test_signed_apps.js]
+[test_signed_apps-marketplace.js]
+[test_signed_dir.js]
+tags = addons psm
+[test_sss_eviction.js]
+[test_sss_readstate.js]
+[test_sss_readstate_child.js]
+support-files = sss_readstate_child_worker.js
+# bug 1124289 - run_test_in_child violates the sandbox on b2g and android
+skip-if = toolkit == 'android' || toolkit == 'gonk'
+[test_sss_readstate_empty.js]
+[test_sss_readstate_garbage.js]
+[test_sss_readstate_huge.js]
+[test_sss_savestate.js]
+[test_sts_fqdn.js]
+[test_sts_holepunch.js]
+[test_sts_ipv4_ipv6.js]
+[test_sts_preloadlist_perwindowpb.js]
+[test_sts_preloadlist_selfdestruct.js]
 [test_validity.js]
 run-sequentially = hardcoded ports
-[test_certviewer_invalid_oids.js]
-skip-if = toolkit == 'android' || buildapp == 'b2g'
-
 [test_weak_crypto.js]
 firefox-appdir = browser