Fix tests to work with DEPRECATED_REMOVED
This commit is contained in:
parent
c70581c272
commit
e46c6c38c9
3 changed files with 7 additions and 7 deletions
|
@ -203,17 +203,16 @@ int main( int argc, char *argv[] )
|
|||
return( ret );
|
||||
#endif
|
||||
|
||||
/* Slow tests last */
|
||||
|
||||
#if defined(POLARSSL_PBKDF2_C)
|
||||
#if defined(POLARSSL_PBKDF2_C) && !defined(POLARSSL_DEPRECATED_REMOVED)
|
||||
if( ( ret = pbkdf2_self_test( v ) ) != 0 )
|
||||
return( ret );
|
||||
#else
|
||||
#endif
|
||||
#if defined(POLARSSL_PKCS5_C)
|
||||
if( ( ret = pkcs5_self_test( v ) ) != 0 )
|
||||
return( ret );
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* Slow tests last */
|
||||
|
||||
/* Not stable enough on Windows and FreeBSD yet */
|
||||
#if __linux__ && defined(POLARSSL_TIMING_C)
|
||||
|
|
|
@ -50,8 +50,9 @@ my %mapping_values;
|
|||
while (@var_req_arr)
|
||||
{
|
||||
my $req = shift @var_req_arr;
|
||||
$req =~ s/(!?)(.*)/$1defined($2)/;
|
||||
|
||||
$suite_pre_code .= "#ifdef $req\n";
|
||||
$suite_pre_code .= "#if $req\n";
|
||||
$suite_post_code .= "#endif /* $req */\n";
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
/* END_HEADER */
|
||||
|
||||
/* BEGIN_DEPENDENCIES
|
||||
* depends_on:POLARSSL_PBKDF2_C
|
||||
* depends_on:POLARSSL_PBKDF2_C:!POLARSSL_DEPRECATED_REMOVED
|
||||
* END_DEPENDENCIES
|
||||
*/
|
||||
|
||||
|
|
Loading…
Reference in a new issue