yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 17:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3143 from gilles-peskine-arm/unmet_dependencies-int-2.16

Browse Source 
[2.16 only] Since unmet_dependencies stores integers, represent them as int
This commit is contained in:
Janos Follath 2020-03-31 15:38:32 +01:00 committed by GitHub
commit bfa0f7d540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/suites/host_test.function
View File

@ -474,7 +474,7 @@ int execute_tests( int argc , const char ** argv )
testfile_index++ ) testfile_index++ )
{ {
int unmet_dep_count = 0; int unmet_dep_count = 0;
char *unmet_dependencies[20]; int unmet_dependencies[20];
test_filename = test_files[ testfile_index ]; test_filename = test_files[ testfile_index ];
@ -520,19 +520,7 @@ int execute_tests( int argc , const char ** argv )
int dep_id = strtol( params[i], NULL, 10 ); int dep_id = strtol( params[i], NULL, 10 );
if( dep_check( dep_id ) != DEPENDENCY_SUPPORTED ) if( dep_check( dep_id ) != DEPENDENCY_SUPPORTED )
{ {
if( 0 == option_verbose ) unmet_dependencies[unmet_dep_count] = dep_id;
{
/* Only one count is needed if not verbose */
unmet_dep_count++;
break;
}
unmet_dependencies[ unmet_dep_count ] = strdup( params[i] );
if( unmet_dependencies[ unmet_dep_count ] == NULL )
{
mbedtls_fprintf( stderr, "FATAL: Out of memory\n" );
mbedtls_exit( MBEDTLS_EXIT_FAILURE );
}
unmet_dep_count++; unmet_dep_count++;
} }
} }
@ -599,9 +587,8 @@ int execute_tests( int argc , const char ** argv )
mbedtls_fprintf( stdout, "\n Unmet dependencies: " ); mbedtls_fprintf( stdout, "\n Unmet dependencies: " );
for( i = 0; i < unmet_dep_count; i++ ) for( i = 0; i < unmet_dep_count; i++ )
{ {
mbedtls_fprintf( stdout, "%s ", mbedtls_fprintf( stdout, "%d ",
unmet_dependencies[i] ); unmet_dependencies[i] );
free( unmet_dependencies[i] );
} }
} }
mbedtls_fprintf( stdout, "\n" ); mbedtls_fprintf( stdout, "\n" );
@ -646,10 +633,6 @@ int execute_tests( int argc , const char ** argv )
total_errors++; total_errors++;
} }
fclose( file ); fclose( file );
/* In case we encounter early end of file */
for( i = 0; i < unmet_dep_count; i++ )
free( unmet_dependencies[i] );
} }
mbedtls_fprintf( stdout, "\n----------------------------------------------------------------------------\n\n"); mbedtls_fprintf( stdout, "\n----------------------------------------------------------------------------\n\n");