From dfb5cff2f581473452becb6e5a07f330c8b69f7f Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sat, 29 Aug 2020 15:18:23 +0200 Subject: [PATCH] Report the first failure, not the last one If test_fail is called multiple times in the same test case, report the location of the first failure, not the last one. With this change, you no longer need to take care in tests that use auxiliary functions not to fail in the main function if the auxiliary function has failed. Signed-off-by: Gilles Peskine --- tests/suites/helpers.function | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function index d384e4456..ca186ddb1 100644 --- a/tests/suites/helpers.function +++ b/tests/suites/helpers.function @@ -336,6 +336,12 @@ jmp_buf jmp_tmp; 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.test = test; test_info.line_no = line_no;