From 1780f89ecf261a5fbe46c720a87d55a02a65263c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 8 Jul 2015 22:08:02 +0100 Subject: [PATCH] Some more scripts simplified make now has an alias test = check --- tests/scripts/curves.pl | 4 +--- tests/scripts/test-ref-configs.pl | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/scripts/curves.pl b/tests/scripts/curves.pl index 11b7d46e54..545b3b7258 100755 --- a/tests/scripts/curves.pl +++ b/tests/scripts/curves.pl @@ -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"; } diff --git a/tests/scripts/test-ref-configs.pl b/tests/scripts/test-ref-configs.pl index 1c973eb10f..d1cc924bf2 100755 --- a/tests/scripts/test-ref-configs.pl +++ b/tests/scripts/test-ref-configs.pl @@ -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 ) {