diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-01 14:03:05 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-12-01 14:03:05 +0900 |
| commit | 47669f40b14c32c9771e0852f7cd3a12eb044c2f (patch) | |
| tree | b2f225d8c6351262c77c053d73aa0b242b121bfb /lib/kunit/kunit-test.c | |
| parent | 2594faafeee2f4406ff82790604e4e3f55037d60 (diff) | |
| parent | 1bddcf77ce6668692fc15e968fd0870d5524d112 (diff) | |
Merge tag 'linux_kselftest-kunit-fixes-6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull KUnit fixes from Shuah Khan:
"Three fixes to warnings and run-time test behavior. With these fixes,
test suite counter will be reset correctly before running tests, kunit
will warn if tests are too slow, and eliminate warning when kfree() as
an action"
* tag 'linux_kselftest-kunit-fixes-6.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
kunit: test: Avoid cast warning when adding kfree() as an action
kunit: Reset suite counter right before running tests
kunit: Warn if tests are slow
Diffstat (limited to 'lib/kunit/kunit-test.c')
| -rw-r--r-- | lib/kunit/kunit-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c index 99d2a3a528e1..de2113a58fa0 100644 --- a/lib/kunit/kunit-test.c +++ b/lib/kunit/kunit-test.c @@ -562,7 +562,7 @@ static void kunit_log_test(struct kunit *test) KUNIT_EXPECT_TRUE(test, test->log->append_newlines); full_log = string_stream_get_string(test->log); - kunit_add_action(test, (kunit_action_t *)kfree, full_log); + kunit_add_action(test, kfree_wrapper, full_log); KUNIT_EXPECT_NOT_ERR_OR_NULL(test, strstr(full_log, "put this in log.")); KUNIT_EXPECT_NOT_ERR_OR_NULL(test, |