diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-04 20:21:07 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-04 20:21:07 -0400 |
| commit | 0db5c549571eb0098a3f709ffb25c2e4909ca01d (patch) | |
| tree | 0dbf1fbe9b25ddab292eadca50703f34de4c919e /src/test/test.c | |
| parent | fd994f55c441922d3c5ae19ad5c254a1ae1eccfd (diff) | |
| parent | d644c93ae9373f99d95870c7b752b790f8714201 (diff) | |
| download | tor-0db5c549571eb0098a3f709ffb25c2e4909ca01d.tar.gz tor-0db5c549571eb0098a3f709ffb25c2e4909ca01d.zip | |
Merge branch 'nss_squashed' into nss_merge
Diffstat (limited to 'src/test/test.c')
| -rw-r--r-- | src/test/test.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/test.c b/src/test/test.c index f96a0b33ed..dc8e3bede3 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -860,7 +860,10 @@ struct testgroup_t testgroups[] = { { "control/event/", controller_event_tests }, { "crypto/", crypto_tests }, { "crypto/ope/", crypto_ope_tests }, +#ifdef ENABLE_OPENSSL { "crypto/openssl/", crypto_openssl_tests }, +#endif + { "crypto/pem/", pem_tests }, { "dir/", dir_tests }, { "dir_handle_get/", dir_handle_get_tests }, { "dir/md/", microdesc_tests }, @@ -912,6 +915,10 @@ struct testgroup_t testgroups[] = { { "status/" , status_tests }, { "storagedir/", storagedir_tests }, { "tortls/", tortls_tests }, +#ifndef ENABLE_NSS + { "tortls/openssl/", tortls_openssl_tests }, +#endif + { "tortls/x509/", x509_tests }, { "util/", util_tests }, { "util/format/", util_format_tests }, { "util/logging/", logging_tests }, |