Merge pull request #3626 from gilles-peskine-arm/test-fail-report-first-2.16

Backport 2.16: Report the first unit test failure, not the last one
This commit is contained in:
Gilles Peskine 2020-09-05 11:16:02 +02:00 committed by GitHub
commit ad5c5a2763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View File

@ -382,6 +382,12 @@ jmp_buf jmp_tmp;
void test_fail( const char *test, int line_no, const char* filename ) void test_fail( const char *test, int line_no, const char* filename )
{ {
if( test_info.result == TEST_RESULT_FAILED )
{
/* We've already recorded the test as having failed. Don't
* overwrite any previous information about the failure. */
return;
}
test_info.result = TEST_RESULT_FAILED; test_info.result = TEST_RESULT_FAILED;
test_info.test = test; test_info.test = test;
test_info.line_no = line_no; test_info.line_no = line_no;

View File

@ -542,7 +542,7 @@ void mbedtls_mpi_lt_mpi_ct( int size_X, char * input_X,
int size_Y, char * input_Y, int size_Y, char * input_Y,
int input_ret, int input_err ) int input_ret, int input_err )
{ {
unsigned ret; unsigned ret = -1;
unsigned input_uret = input_ret; unsigned input_uret = input_ret;
mbedtls_mpi X, Y; mbedtls_mpi X, Y;
mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y ); mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y );