summaryrefslogtreecommitdiffstats
path: root/include/kunit
diff options
context:
space:
mode:
authorRae Moar <rmoar@google.com>2023-03-08 20:39:52 +0000
committerShuah Khan <skhan@linuxfoundation.org>2023-03-10 13:59:43 -0700
commit2c6a96dad5797e57b4cf04101d6c8d5c7a571603 (patch)
treee19212faf62e375b494418da13873e4a4dae30f7 /include/kunit
parentf9a301c3317daa921375da0aec82462ddf019928 (diff)
downloadlinux-stable-2c6a96dad5797e57b4cf04101d6c8d5c7a571603.tar.gz
linux-stable-2c6a96dad5797e57b4cf04101d6c8d5c7a571603.tar.bz2
linux-stable-2c6a96dad5797e57b4cf04101d6c8d5c7a571603.zip
kunit: fix bug of extra newline characters in debugfs logs
Fix bug of the extra newline characters in debugfs logs. When a line is added to debugfs with a newline character at the end, an extra line appears in the debugfs log. This is due to a discrepancy between how the lines are printed and how they are added to the logs. Remove this discrepancy by checking if a newline character is present before adding a newline character. This should closely match the printk behavior. Add kunit_log_newline_test to provide test coverage for this issue. (Also, move kunit_log_test above suite definition to remove the unnecessary declaration prior to the suite definition) As an example, say we add these two lines to the log: kunit_log(..., "KTAP version 1\n"); kunit_log(..., "1..1"); The debugfs log before this fix: KTAP version 1 1..1 The debugfs log after this fix: KTAP version 1 1..1 Signed-off-by: Rae Moar <rmoar@google.com> Reviewed-by: David Gow <davidgow@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'include/kunit')
-rw-r--r--include/kunit/test.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/kunit/test.h b/include/kunit/test.h
index 0668d29f3453..9721584027d8 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -420,7 +420,7 @@ void __printf(2, 3) kunit_log_append(char *log, const char *fmt, ...);
#define kunit_log(lvl, test_or_suite, fmt, ...) \
do { \
printk(lvl fmt, ##__VA_ARGS__); \
- kunit_log_append((test_or_suite)->log, fmt "\n", \
+ kunit_log_append((test_or_suite)->log, fmt, \
##__VA_ARGS__); \
} while (0)