Merge pull request #540 from h2o/kazuho/test-keyex-use-subtest

use subtest for structured output
h2o · Aug 13, 2024 · 89fe56f · 89fe56f
2 parents e4f0a27 + cfa0fd5
commit 89fe56f
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/t/openssl.c b/t/openssl.c
@@ -124,22 +124,22 @@ static void test_bf(void)
 
 static void test_key_exchanges(void)
 {
-    test_key_exchange(&ptls_openssl_secp256r1, &ptls_openssl_secp256r1);
-    test_key_exchange(&ptls_openssl_secp256r1, &ptls_minicrypto_secp256r1);
-    test_key_exchange(&ptls_minicrypto_secp256r1, &ptls_openssl_secp256r1);
+    subtest("secp256r1-self", test_key_exchange, &ptls_openssl_secp256r1, &ptls_openssl_secp256r1);
+    subtest("secp256r1-to-minicrypto", test_key_exchange, &ptls_openssl_secp256r1, &ptls_minicrypto_secp256r1);
+    subtest("secp256r1-from-minicrypto", test_key_exchange, &ptls_minicrypto_secp256r1, &ptls_openssl_secp256r1);
 
 #if PTLS_OPENSSL_HAVE_SECP384R1
-    test_key_exchange(&ptls_openssl_secp384r1, &ptls_openssl_secp384r1);
+    subtest("secp384r1", test_key_exchange, &ptls_openssl_secp384r1, &ptls_openssl_secp384r1);
 #endif
 
 #if PTLS_OPENSSL_HAVE_SECP521R1
-    test_key_exchange(&ptls_openssl_secp521r1, &ptls_openssl_secp521r1);
+    subtest("secp521r1", test_key_exchange, &ptls_openssl_secp521r1, &ptls_openssl_secp521r1);
 #endif
 
 #if PTLS_OPENSSL_HAVE_X25519
-    test_key_exchange(&ptls_openssl_x25519, &ptls_openssl_x25519);
-    test_key_exchange(&ptls_openssl_x25519, &ptls_minicrypto_x25519);
-    test_key_exchange(&ptls_minicrypto_x25519, &ptls_openssl_x25519);
+    subtest("x25519-self", test_key_exchange, &ptls_openssl_x25519, &ptls_openssl_x25519);
+    subtest("x25519-to-minicrypto", test_key_exchange, &ptls_openssl_x25519, &ptls_minicrypto_x25519);
+    subtest("x25519-from-minicrypto", test_key_exchange, &ptls_minicrypto_x25519, &ptls_openssl_x25519);
 #endif
 }