Rework test-ref-configs.pl to also use ssl-opt.sh

This commit is contained in:
Manuel Pégourié-Gonnard 2015-10-20 14:07:03 +02:00
parent b6fe70b928
commit eb47b870b1

View file

@ -11,14 +11,17 @@ use warnings;
use strict; use strict;
my %configs = ( my %configs = (
'config-mini-tls1_1.h' 'config-mini-tls1_1.h' => {
=> '-m tls1_1 -f \'^DES-CBC3-SHA$\|^TLS-RSA-WITH-3DES-EDE-CBC-SHA$\'', 'compat' => '-m tls1_1 -f \'^DES-CBC3-SHA$\|^TLS-RSA-WITH-3DES-EDE-CBC-SHA$\'',
'config-suite-b.h' },
=> "-m tls1_2 -f 'ECDHE-ECDSA.*AES.*GCM' -p mbedTLS", 'config-suite-b.h' => {
'config-picocoin.h' 'compat' => "-m tls1_2 -f 'ECDHE-ECDSA.*AES.*GCM' -p mbedTLS",
=> 0, },
'config-ccm-psk-tls1_2.h' 'config-picocoin.h' => {
=> '-m tls1_2 -f \'^TLS-PSK-WITH-AES-...-CCM-8\'', },
'config-ccm-psk-tls1_2.h' => {
'compat' => '-m tls1_2 -f \'^TLS-PSK-WITH-AES-...-CCM-8\'',
},
); );
# If no config-name is provided, use all known configs. # If no config-name is provided, use all known configs.
@ -46,7 +49,7 @@ sub abort {
die $_[0]; die $_[0];
} }
while( my ($conf, $args) = each %configs ) { while( my ($conf, $data) = each %configs ) {
system( "cp $config_h.bak $config_h" ) and die; system( "cp $config_h.bak $config_h" ) and die;
system( "make clean" ) and die; system( "make clean" ) and die;
@ -60,10 +63,11 @@ while( my ($conf, $args) = each %configs ) {
system( "make" ) and abort "Failed to build: $conf\n"; system( "make" ) and abort "Failed to build: $conf\n";
system( "make test" ) and abort "Failed test suite: $conf\n"; system( "make test" ) and abort "Failed test suite: $conf\n";
if( $args ) my $compat = $data->{'compat'};
if( $compat )
{ {
print "\nrunning compat.sh $args\n"; print "\nrunning compat.sh $compat\n";
system( "tests/compat.sh $args" ) system( "tests/compat.sh $compat" )
and abort "Failed compat.sh: $conf\n"; and abort "Failed compat.sh: $conf\n";
} }
else else