From: Zbigniew Jędrzejewski-Szmek Date: Tue, 3 Dec 2024 13:25:59 +0000 (+0100) Subject: shared/tests: adjust error messages X-Git-Tag: v257~40^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=444e9ba66003eb87cac2da00726dc45ed6e557cb;p=thirdparty%2Fsystemd.git shared/tests: adjust error messages Grammar is improved a bit and some messages are shortened. --- diff --git a/src/shared/tests.h b/src/shared/tests.h index 8caf4d9d83d..173d64fa77d 100644 --- a/src/shared/tests.h +++ b/src/shared/tests.h @@ -225,7 +225,7 @@ static inline int run_test_table(void) { ({ \ typeof(expr) _result = (expr); \ if (_result < 0) { \ - log_error_errno(_result, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ + log_error_errno(_result, "%s:%i: Assertion failed: expected \"%s\" to succeed, but got error: %m", \ PROJECT_FILE, __LINE__, #expr); \ abort(); \ } \ @@ -236,7 +236,7 @@ static inline int run_test_table(void) { ({ \ typeof(expr) _result = (expr); \ if (_result < 0) { \ - log_error_errno(_result, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ + log_error_errno(_result, "%s:%i: Assertion failed: expected \"%s\" to succeed, but got error: %m", \ PROJECT_FILE, __LINE__, #expr); \ abort(); \ } \ @@ -251,7 +251,7 @@ static inline int run_test_table(void) { ({ \ typeof(expr) _result = (expr); \ if (_result < 0) { \ - log_error_errno(_result, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ + log_error_errno(_result, "%s:%i: Assertion failed: expected \"%s\" to succeed, but got error: %m", \ PROJECT_FILE, __LINE__, #expr); \ abort(); \ } \ @@ -266,19 +266,19 @@ static inline int run_test_table(void) { #define ASSERT_OK_EQ(expr1, expr2) \ ({ \ - typeof(expr1) _expr1 = (expr1); \ - typeof(expr2) _expr2 = (expr2); \ - if (_expr1 < 0) { \ - log_error_errno(_expr1, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ + typeof(expr1) _expr1 = (expr1); \ + typeof(expr2) _expr2 = (expr2); \ + if (_expr1 < 0) { \ + log_error_errno(_expr1, "%s:%i: Assertion failed: expected \"%s\" to succeed, but got error: %m", \ PROJECT_FILE, __LINE__, #expr1); \ abort(); \ } \ - if (_expr1 != _expr2) { \ + if (_expr1 != _expr2) { \ char _sexpr1[DECIMAL_STR_MAX(typeof(expr1))]; \ char _sexpr2[DECIMAL_STR_MAX(typeof(expr2))]; \ - xsprintf(_sexpr1, DECIMAL_STR_FMT(_expr1), _expr1); \ - xsprintf(_sexpr2, DECIMAL_STR_FMT(_expr2), _expr2); \ - log_error("%s:%i: Assertion failed: expected \"%s == %s\", but %s != %s", \ + xsprintf(_sexpr1, DECIMAL_STR_FMT(_expr1), _expr1); \ + xsprintf(_sexpr2, DECIMAL_STR_FMT(_expr2), _expr2); \ + log_error("%s:%i: Assertion failed: expected \"%s == %s\", got %s != %s", \ PROJECT_FILE, __LINE__, #expr1, #expr2, _sexpr1, _sexpr2); \ abort(); \ } \ @@ -288,7 +288,7 @@ static inline int run_test_table(void) { ({ \ typeof(expr) _result = (expr); \ if (_result < 0) { \ - log_error_errno(errno, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ + log_error_errno(errno, "%s:%i: Assertion failed: expected \"%s\" to succeed, but got error: %m", \ PROJECT_FILE, __LINE__, #expr); \ abort(); \ } \ @@ -298,7 +298,7 @@ static inline int run_test_table(void) { ({ \ typeof(expr) _result = (expr); \ if (_result < 0) { \ - log_error_errno(errno, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ + log_error_errno(errno, "%s:%i: Assertion failed: expected \"%s\" to succeed, but got error: %m", \ PROJECT_FILE, __LINE__, #expr); \ abort(); \ } \ @@ -316,7 +316,7 @@ static inline int run_test_table(void) { typeof(expr1) _expr1 = (expr1); \ typeof(expr2) _expr2 = (expr2); \ if (_expr1 < 0) { \ - log_error_errno(errno, "%s:%i: Assertion failed: expected \"%s\" to succeed but got the following error: %m", \ + log_error_errno(errno, "%s:%i: Assertion failed: expected \"%s\" to succeed, but got error: %m", \ PROJECT_FILE, __LINE__, #expr1); \ abort(); \ } \ @@ -393,7 +393,7 @@ static inline int run_test_table(void) { ({ \ typeof(expr) _result = (expr); \ if (_result != NULL) { \ - log_error("%s:%i: Assertion failed: expected \"%s\" to be NULL, but \"%p\" != NULL", \ + log_error("%s:%i: Assertion failed: expected \"%s\" to be NULL, got \"%p\" != NULL", \ PROJECT_FILE, __LINE__, #expr, _result); \ abort(); \ } \ @@ -412,7 +412,7 @@ static inline int run_test_table(void) { ({ \ const char *_expr1 = (expr1), *_expr2 = (expr2); \ if (!streq_ptr(_expr1, _expr2)) { \ - log_error("%s:%i: Assertion failed: expected \"%s == %s\", but \"%s != %s\"", \ + log_error("%s:%i: Assertion failed: expected \"%s == %s\", got \"%s != %s\"", \ PROJECT_FILE, __LINE__, #expr1, #expr2, strnull(_expr1), strnull(_expr2)); \ abort(); \ } \