diff options
author | Emilia Kasper <emilia@openssl.org> | 2016-07-21 19:19:07 +0200 |
---|---|---|
committer | Emilia Kasper <emilia@openssl.org> | 2016-07-22 15:54:26 +0200 |
commit | d0c4415de5eaa555ead6eb99660e46410b45e181 (patch) | |
tree | 406104d1c38ddde3a256d7c4a6d6fec9e023eaab /test/generate_ssl_tests.pl | |
parent | d972af2b5e6b8c266f878ce28e60badcbc402311 (diff) |
SSL tests: compress generated output a little
Don't emit duplicate server/client sections when they are
identical. Instead, just point to the same section.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/generate_ssl_tests.pl')
-rw-r--r-- | test/generate_ssl_tests.pl | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/test/generate_ssl_tests.pl b/test/generate_ssl_tests.pl index 951421bb2c..f103e8efb5 100644 --- a/test/generate_ssl_tests.pl +++ b/test/generate_ssl_tests.pl @@ -45,32 +45,35 @@ sub print_templates { $test->{"server"} = { (%ssltests::base_server, %{$test->{"server"}}) }; if (defined $test->{"server2"}) { $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server2"}}) }; - } elsif (defined $test->{"test"}->{"ServerNameCallback"}) { - # Default is the same as server. - $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server"}}) }; } else { - # Do not emit an empty "server2" section. + if (defined $test->{"test"}->{"ServerNameCallback"}) { + # Default is the same as server. + $test->{"reuse_server2"} = 1; + } + # Do not emit an empty/duplicate "server2" section. $test->{"server2"} = { }; } if (defined $test->{"resume_server"}) { $test->{"resume_server"} = { (%ssltests::base_server, %{$test->{"resume_server"}}) }; - } elsif (defined $test->{"test"}->{"HandshakeMode"} && - $test->{"test"}->{"HandshakeMode"} eq "Resume") { - # Default is the same as server. - $test->{"resume_server"} = { (%ssltests::base_server, %{$test->{"server"}}) }; } else { - # Do not emit an empty "resume-server" section. + if (defined $test->{"test"}->{"HandshakeMode"} && + $test->{"test"}->{"HandshakeMode"} eq "Resume") { + # Default is the same as server. + $test->{"reuse_resume_server"} = 1; + } + # Do not emit an empty/duplicate "resume-server" section. $test->{"resume_server"} = { }; } $test->{"client"} = { (%ssltests::base_client, %{$test->{"client"}}) }; if (defined $test->{"resume_client"}) { $test->{"resume_client"} = { (%ssltests::base_client, %{$test->{"resume_client"}}) }; - } elsif (defined $test->{"test"}->{"HandshakeMode"} && - $test->{"test"}->{"HandshakeMode"} eq "Resume") { - # Default is the same as client. - $test->{"resume_client"} = { (%ssltests::base_client, %{$test->{"client"}}) }; } else { - # Do not emit an empty "resume-client" section. + if (defined $test->{"test"}->{"HandshakeMode"} && + $test->{"test"}->{"HandshakeMode"} eq "Resume") { + # Default is the same as client. + $test->{"reuse_resume_client"} = 1; + } + # Do not emit an empty/duplicate "resume-client" section. $test->{"resume_client"} = { }; } } |