Some more scripts simplified

make now has an alias test = check
This commit is contained in:
Manuel Pégourié-Gonnard 2015-07-08 22:08:02 +01:00
parent 3d404b4763
commit 1780f89ecf
2 changed files with 2 additions and 6 deletions

View File

@ -15,8 +15,6 @@ my $sed_cmd = 's/^#define \(MBEDTLS_ECP_DP.*_ENABLED\)/\1/p';
my $config_h = 'include/mbedtls/config.h';
my @curves = split( /\s+/, `sed -n -e '$sed_cmd' $config_h` );
my $test = system( "grep -i cmake Makefile >/dev/null" ) ? 'check' : 'test';
system( "cp $config_h $config_h.bak" ) and die;
sub abort {
system( "mv $config_h.bak $config_h" ) and warn "$config_h not restored\n";
@ -36,7 +34,7 @@ for my $curve (@curves) {
system( "make mbedtls" ) and abort "Failed to build lib: $curve\n";
system( "cd tests && make" ) and abort "Failed to build tests: $curve\n";
system( "make $test" ) and abort "Failed test suite: $curve\n";
system( "make test" ) and abort "Failed test suite: $curve\n";
}

View File

@ -38,8 +38,6 @@ if ($#ARGV >= 0) {
-d 'library' && -d 'include' && -d 'tests' or die "Must be run from root\n";
my $test = system( "grep -i cmake Makefile >/dev/null" ) ? 'check' : 'test';
my $config_h = 'include/mbedtls/config.h';
system( "cp $config_h $config_h.bak" ) and die;
@ -60,7 +58,7 @@ while( my ($conf, $args) = each %configs ) {
and abort "Failed to activate $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 )
{