History

Merge tag 'linux-kselftest-kunit-fixes-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull KUnit fixes from Shuah Khan: "Three fixes to bugs that cause kernel crash, link error during build, and a third to fix kunit_test_init_section_suites() extra indirection issue" * tag 'linux-kselftest-kunit-fixes-6.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: kunit: fix kunit_test_init_section_suites(...) kunit: fix bug in KUNIT_EXPECT_MEMEQ kunit: Export kunit_running()

Linus Torvalds committed 3 years ago

Commit e7368fd2 parents 42c78a5 254c7133 files · +29 −18Browse files

Showing the changes to include (1 of 3 files). Show all

Unified · Split

include/kunit/test.h+3−3
@@ -303,7 +303,6 @@ static inline int kunit_run_all_tests(void) · 302 unmodified lines
303303 */
304304 #define kunit_test_init_section_suites(__suites...) \
305305 __kunit_test_suites(CONCATENATE(__UNIQUE_ID(array), _probe), \
306− CONCATENATE(__UNIQUE_ID(suites), _probe), \
307306 ##__suites)
308307
309308 #define kunit_test_init_section_suite(suite) \
@@ -683,8 +682,9 @@ do { \ · 373 unmodified lines
683682 .right_text = #right, \
684683 }; \
685684 \
686− if (likely(memcmp(__left, __right, __size) op 0)) \
687− break; \
685+ if (likely(__left && __right)) \
686+ if (likely(memcmp(__left, __right, __size) op 0)) \
687+ break; \
688688 \
689689 _KUNIT_FAILED(test, \
690690 assert_type, \