diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-01-29 19:55:44 +0600 |
|---|---|---|
| committer | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-01-31 15:47:42 +0600 |
| commit | eff0880f3b026a1c2a26eb56e4eb7c844c0f9a3e (patch) | |
| tree | c85ba6419f72fbd968a7cb83dff35812324a08c6 /tests | |
| parent | 27961906ad77e42320b1a955cbf6a40c5113b129 (diff) | |
tests/logging: also test printing the filename information
This commit demonstrates a bug introduced in [1], which can be
observed when the logging is configured to print the filename
*after* the logging message (LOG_FILENAME_POS_HEADER_END):
logging print file 1 last
^^^^
In this mode, the code in _output_buf() overwrites the '\n' sybmol
contained in the logging message itself by shifting the 'offset'
backwards, and appends the nipped '\n' after the filename info.
The problem is that the 'len' variable is not updated in this case,
so the resulting length includes +1 character - '\0', which gets
printed at the end of every logging line.
Interestingly enough, this problem affects only the wqueue mode.
Change-Id: I54bf5e5c036efb1908232fe3d8e8e2989715fbb3
Related: [1] I393907b3c9e0cc1145e102328adad0a83ee13a9f
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/logging/logging_test.c | 8 | ||||
| -rw-r--r-- | tests/logging/logging_test_stream.err | 2 | ||||
| -rw-r--r-- | tests/logging/logging_test_wqueue.err | bin | 348 -> 488 bytes |
3 files changed, 10 insertions, 0 deletions
diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c index 12a7374f..3548b1dd 100644 --- a/tests/logging/logging_test.c +++ b/tests/logging/logging_test.c @@ -130,5 +130,13 @@ int main(int argc, char **argv) log_set_category_filter(stderr_target, DLGLOBAL, 1, LOGL_DEBUG); DEBUGP(DLGLOBAL, "You should see this (DLGLOBAL on DEBUG)\n"); + /* Test printing of the filename */ + log_set_print_filename2(stderr_target, LOG_FILENAME_BASENAME); + + log_set_print_filename_pos(stderr_target, LOG_FILENAME_POS_HEADER_END); + DEBUGP(DLGLOBAL, "A message with source info printed first\n"); + log_set_print_filename_pos(stderr_target, LOG_FILENAME_POS_LINE_END); + DEBUGP(DLGLOBAL, "A message with source info printed last\n"); + return 0; } diff --git a/tests/logging/logging_test_stream.err b/tests/logging/logging_test_stream.err index 17b3cad0..01ab8782 100644 --- a/tests/logging/logging_test_stream.err +++ b/tests/logging/logging_test_stream.err @@ -7,3 +7,5 @@ DLGLOBAL You should see this on DLGLOBAL (c) DLGLOBAL You should see this on DLGLOBAL (d) DLGLOBAL You should see this on DLGLOBAL (e) DLGLOBAL You should see this (DLGLOBAL on DEBUG) +DLGLOBAL logging_test.c:137 A message with source info printed first +DLGLOBAL A message with source info printed last (logging_test.c:139) diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err Binary files differindex 17b3cad0..3e2008ba 100644 --- a/tests/logging/logging_test_wqueue.err +++ b/tests/logging/logging_test_wqueue.err |