Merge pull request #3627 from gilles-peskine-arm/test-fail-report-first-2.7
Backport 2.7: Report the first unit test failure, not the last one
diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function
index c1c76ec..7aa614a 100644
--- a/tests/suites/helpers.function
+++ b/tests/suites/helpers.function
@@ -211,6 +211,12 @@
void test_fail( const char *test, int line_no, const char* filename )
{
+ if( test_info.failed )
+ {
+ /* We've already recorded the test as having failed. Don't
+ * overwrite any previous information about the failure. */
+ return;
+ }
test_info.failed = 1;
test_info.test = test;
test_info.line_no = line_no;
diff --git a/tests/suites/test_suite_mpi.function b/tests/suites/test_suite_mpi.function
index 6f5abf3..d023466 100644
--- a/tests/suites/test_suite_mpi.function
+++ b/tests/suites/test_suite_mpi.function
@@ -337,7 +337,7 @@
int size_Y, char * input_Y,
int input_ret, int input_err )
{
- unsigned ret;
+ unsigned ret = -1;
unsigned input_uret = input_ret;
mbedtls_mpi X, Y;
mbedtls_mpi_init( &X ); mbedtls_mpi_init( &Y );