diff options
Diffstat (limited to 'test/ssl_test.tmpl')
-rw-r--r-- | test/ssl_test.tmpl | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/test/ssl_test.tmpl b/test/ssl_test.tmpl index c9cc8de62b..cc3d99f94c 100644 --- a/test/ssl_test.tmpl +++ b/test/ssl_test.tmpl @@ -26,17 +26,21 @@ client = {-$testname-}-client{- [{-$testname-}-server] {- foreach my $key (sort keys %server) { + # Emitted in the test section. + next if ($key eq "extra"); $OUT .= qq{$key} . " = " . qq{$server{$key}\n} if defined $server{$key}; } if (%server2) { $OUT .= "\n[$testname-server2]\n"; foreach my $key (sort keys %server2) { + next if ($key eq "extra"); $OUT .= qq{$key} . " = " . qq{$server2{$key}\n} if defined $server2{$key}; } } if (%resume_server) { $OUT .= "\n[$testname-resume-server]\n"; foreach my $key (sort keys %resume_server) { + next if ($key eq "extra"); $OUT .= qq{$key} . " = " . qq{$resume_server{$key}\n} if defined $resume_server{$key}; } } @@ -44,11 +48,13 @@ client = {-$testname-}-client{- [{-$testname-}-client] {- foreach my $key (sort keys %client) { + next if ($key eq "extra"); $OUT .= qq{$key} . " = " . qq{$client{$key}\n} if defined $client{$key}; } if (%resume_client) { $OUT .= "\n[$testname-resume-client]\n"; foreach my $key (sort keys %resume_client) { + next if ($key eq "extra"); $OUT .= qq{$key} . " = " . qq{$resume_client{$key}\n} if defined $resume_client{$key}; } } @@ -58,4 +64,63 @@ client = {-$testname-}-client{- foreach my $key (sort keys %test) { $OUT .= qq{$key} ." = " . qq{$test{$key}\n} if defined $test{$key}; } + + # The extra server/client configuration sections. + if ($server{"extra"}) { + $OUT .= "server = $testname-server-extra\n"; + } + if (%server2 && $server2{"extra"}) { + $OUT .= "server2 = $testname-server2-extra\n"; + } elsif ($reuse_server2 && $server{"extra"}) { + $OUT .= "server2 = $testname-server-extra\n"; + } + if (%resume_server && $resume_server{"extra"}) { + $OUT .= "resume-server = $testname-resume-server-extra\n"; + } elsif ($reuse_resume_server && $server{"extra"}) { + $OUT .= "resume-server = $testname-server-extra\n"; + } + if ($client{"extra"}) { + $OUT .= "client = $testname-client-extra\n"; + } + if (%resume_client && $resume_client{"extra"}) { + $OUT .= "resume-client = $testname-resume-client-extra\n"; + } elsif ($reuse_resume_client && $client{"extra"}) { + $OUT .= "client = $testname-client-extra\n"; + } + + if ($server{"extra"}) { + $OUT .= "\n[$testname-server-extra]\n"; + foreach my $key (sort keys $server{"extra"}) { + $OUT .= qq{$key} . " = " . qq{$server{"extra"}{$key}\n} + if defined $server{"extra"}{$key}; + } + } + if (%server2 && $server2{"extra"}) { + $OUT .= "\n[$testname-server2-extra]\n"; + foreach my $key (sort keys $server2{"extra"}) { + $OUT .= qq{$key} . " = " . qq{$server2{"extra"}{$key}\n} + if defined $server2{"extra"}{$key}; + } + } + if (%resume_server && $resume_server{"extra"}) { + $OUT .= "\n[$testname-resume-server-extra]\n"; + foreach my $key (sort keys $resume_server{"extra"}) { + $OUT .= qq{$key} . " = " . qq{$resume_server{"extra"}{$key}\n} + if defined $resume_server{"extra"}{$key}; + } + } + if ($client{"extra"}) { + $OUT .= "\n[$testname-client-extra]\n"; + foreach my $key (sort keys $client{"extra"}) { + $OUT .= qq{$key} . " = " . qq{$client{"extra"}{$key}\n} + if defined $client{"extra"}{$key}; + } + } + if (%resume_client && $resume_client{"extra"}) { + $OUT .= "\n[$testname-resume-client-extra]\n"; + foreach my $key (sort keys $resume_client{"extra"}) { + $OUT .= qq{$key} . " = " . qq{$resume_client{"extra"}{$key}\n} + if defined $resume_client{"extra"}{$key}; + } + } -} |