Thread (5 messages) 5 messages, 2 authors, 2020-02-18

Re: [PATCH v4 kunit-next 2/3] kunit: add log test

From: Brendan Higgins <hidden>
Date: 2020-02-18 19:26:56
Also in: linux-kselftest, lkml

On Mon, Feb 17, 2020 at 6:28 AM Alan Maguire [off-list ref] wrote:
the logging test ensures multiple strings logged appear in the
log string associated with the test when CONFIG_KUNIT_DEBUGFS is
enabled.

Signed-off-by: Alan Maguire <redacted>
Reviewed-by: Brendan Higgins <redacted>

One minor comment below.
quoted hunk ↗ jump to hunk
---
 lib/kunit/kunit-test.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c
index aceb5bf..0789060 100644
--- a/lib/kunit/kunit-test.c
+++ b/lib/kunit/kunit-test.c
@@ -329,6 +329,31 @@ static void kunit_resource_test_exit(struct kunit *test)
        .exit = kunit_resource_test_exit,
        .test_cases = kunit_resource_test_cases,
 };
-kunit_test_suites(&kunit_try_catch_test_suite, &kunit_resource_test_suite);
+
+static void kunit_log_test(struct kunit *test)
+{
+       kunit_log(KERN_INFO, test, "put this in log.");
+       kunit_log(KERN_INFO, test, "this too.");
+
+#ifdef CONFIG_KUNIT_DEBUGFS
+       KUNIT_EXPECT_NOT_ERR_OR_NULL(test,
+                                    strstr(test->log, "put this in log."));
+       KUNIT_EXPECT_NOT_ERR_OR_NULL(test,
+                                    strstr(test->log, "this too."));
+#endif
+}
Would you mind adding some expectations against the suite log? It
might be good for the sake of completeness.
+
+static struct kunit_case kunit_log_test_cases[] = {
+       KUNIT_CASE(kunit_log_test),
+       {}
+};
+
+static struct kunit_suite kunit_log_test_suite = {
+       .name = "kunit-log-test",
+       .test_cases = kunit_log_test_cases,
+};
+
+kunit_test_suites(&kunit_try_catch_test_suite, &kunit_resource_test_suite,
+                 &kunit_log_test_suite);

 MODULE_LICENSE("GPL v2");
--
1.8.3.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help