yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 10:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests to work with DEPRECATED_REMOVED

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-03-23 13:59:10 +01:00
parent c70581c272
commit e46c6c38c9
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
programs/test/selftest.c
View File

@ -203,17 +203,16 @@ int main( int argc, char *argv[] )
return( ret ); return( ret );
#endif #endif
/* Slow tests last */ #if defined(POLARSSL_PBKDF2_C) && !defined(POLARSSL_DEPRECATED_REMOVED)
#if defined(POLARSSL_PBKDF2_C)
if( ( ret = pbkdf2_self_test( v ) ) != 0 ) if( ( ret = pbkdf2_self_test( v ) ) != 0 )
return( ret ); return( ret );
#else #endif
#if defined(POLARSSL_PKCS5_C) #if defined(POLARSSL_PKCS5_C)
if( ( ret = pkcs5_self_test( v ) ) != 0 ) if( ( ret = pkcs5_self_test( v ) ) != 0 )
return( ret ); return( ret );
#endif #endif
#endif
/* Slow tests last */
/* Not stable enough on Windows and FreeBSD yet */ /* Not stable enough on Windows and FreeBSD yet */
#if __linux__ && defined(POLARSSL_TIMING_C) #if __linux__ && defined(POLARSSL_TIMING_C)

3
tests/scripts/generate_code.pl
View File

@ -50,8 +50,9 @@ my %mapping_values;
while (@var_req_arr) while (@var_req_arr)
{ {
my $req = shift @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"; $suite_post_code .= "#endif /* $req */\n";
} }

2
tests/suites/test_suite_pbkdf2.function
View File

@ -3,7 +3,7 @@
/* END_HEADER */ /* END_HEADER */
/* BEGIN_DEPENDENCIES /* BEGIN_DEPENDENCIES
* depends_on:POLARSSL_PBKDF2_C * depends_on:POLARSSL_PBKDF2_C:!POLARSSL_DEPRECATED_REMOVED
* END_DEPENDENCIES * END_DEPENDENCIES
*/ */