Change all our uses of CRYPTO_THREAD_run_once to use RUN_ONCE instead

[openssl.git] / test / ssl_test.tmpl

diff --git a/test/ssl_test.tmpl b/test/ssl_test.tmpl
index d4c0c87616a99c24489ae01ad1461903b9dfb3ee..6a5333e9f43f9835969ac7e864c05493a5b5cf0e 100644 (file)
--- a/test/ssl_test.tmpl
+++ b/test/ssl_test.tmpl
@@ -2,8 +2,13 @@
 ssl_conf = {-$testname-}-ssl
 
 [{-$testname-}-ssl]
-server = {-$testname-}-server
-server2 = {-$testname-}-server2
+server = {-$testname-}-server{-
+    # The server2 section is optional.
+    $OUT = "";
+    if (%server2) {
+        $OUT .= "\nserver2 = $testname-server2";
+    }
+-}
 client = {-$testname-}-client
 
 [{-$testname-}-server]
@@ -11,22 +16,19 @@ client = {-$testname-}-client
     foreach my $key (sort keys %server) {
         $OUT .= qq{$key} . " = " . qq{$server{$key}\n} if defined $server{$key};
     }
--}
-
-[{-$testname-}-server2]
-{-
-    foreach my $key (sort keys %server2) {
-        $OUT .= qq{$key} . " = " . qq{$server2{$key}\n} if defined $server2{$key};
+    if (%server2) {
+        $OUT .= "\n[$testname-server2]\n";
+        foreach my $key (sort keys %server2) {
+            $OUT .= qq{$key} . " = " . qq{$server2{$key}\n} if defined $server2{$key};
+        }
     }
 -}
-
 [{-$testname-}-client]
 {-
     foreach my $key (sort keys %client) {
         $OUT .= qq{$key} . " = " . qq{$client{$key}\n} if defined $client{$key};
     }
 -}
-
 [test-{-$idx-}]
 {-
     foreach my $key (sort keys %test) {