shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-01 08:58:29 +03:00
Code

shared/tests: adjust error messages

Browse Source 
Grammar is improved a bit and some messages are shortened.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-12-03 14:25:59 +01:00
parent 80ea227191
commit 444e9ba660
1 changed files with 16 additions and 16 deletions

32
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(); \
} \