From 29b27d59d59e5b0b9152c068346b4ac87614adf0 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Wed, 10 Apr 2024 13:23:53 +0200 Subject: [PATCH] tests: Improve assertion error messages --- src/shared/tests.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/shared/tests.h b/src/shared/tests.h index 07e05bf2676..f49f450e0d0 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -209,7 +209,7 @@ static inline int run_test_table(void) { ({ \ typeof(expr) _result = (expr); \ if (_result < 0) { \ - log_error_errno(_result, "%s:%i: Assertion failed: %s: %m", \ + log_error_errno(_result, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ PROJECT_FILE, __LINE__, #expr); \ abort(); \ } \ @@ -235,9 +235,10 @@ static inline int run_test_table(void) { #define ASSERT_NULL(expr) \ ({ \ - if ((expr) != NULL) { \ - log_error("%s:%i: Assertion failed: expected \"%s\" to be NULL", \ - PROJECT_FILE, __LINE__, #expr); \ + typeof(expr) _result = (expr); \ + if (_result != NULL) { \ + log_error("%s:%i: Assertion failed: expected \"%s\" to be NULL, but \"%p\" != NULL", \ + PROJECT_FILE, __LINE__, #expr, _result); \ abort(); \ } \ })