Commit e35ff25f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-kunit-fixes-6.0-rc5' of... 

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

Pull KUnit fixes from Shuah Khan:
 "Two fixes to test build and a fix for incorrect taint reason reporting"

* tag 'linux-kselftest-kunit-fixes-6.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  tools: Add new "test" taint to kernel-chktaint
  kunit: fix Kconfig for build-in tests USB4 and Nitro Enclaves
  kunit: fix assert_type for comparison macros
parents 22b2e2d6 2a2dfc86

drivers/thunderbolt/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ config USB4_DEBUGFS_WRITE 


config USB4_KUNIT_TEST

	bool "KUnit tests" if !KUNIT_ALL_TESTS

	depends on (USB4=m || KUNIT=y)

	depends on KUNIT

	depends on USB4 && KUNIT=y

	default KUNIT_ALL_TESTS



config USB4_DMA_TEST

drivers/virt/nitro_enclaves/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ config NITRO_ENCLAVES 


config NITRO_ENCLAVES_MISC_DEV_TEST

	bool "Tests for the misc device functionality of the Nitro Enclaves" if !KUNIT_ALL_TESTS

	depends on NITRO_ENCLAVES && KUNIT

	depends on NITRO_ENCLAVES && KUNIT=y

	default KUNIT_ALL_TESTS

	help

	  Enable KUnit tests for the misc device functionality of the Nitro

include/kunit/test.h

+3 −3
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ do { \ 


#define KUNIT_EXPECT_LE_MSG(test, left, right, fmt, ...)		       \

	KUNIT_BINARY_INT_ASSERTION(test,				       \

				   KUNIT_ASSERTION,			       \

				   KUNIT_EXPECTATION,			       \

				   left, <=, right,			       \

				   fmt,					       \

				    ##__VA_ARGS__)
@@ -1116,7 +1116,7 @@ do { \ 


#define KUNIT_ASSERT_LT_MSG(test, left, right, fmt, ...)		       \

	KUNIT_BINARY_INT_ASSERTION(test,				       \

				   KUNIT_EXPECTATION,			       \

				   KUNIT_ASSERTION,			       \

				   left, <, right,			       \

				   fmt,					       \

				    ##__VA_ARGS__)
@@ -1157,7 +1157,7 @@ do { \ 


#define KUNIT_ASSERT_GT_MSG(test, left, right, fmt, ...)		       \

	KUNIT_BINARY_INT_ASSERTION(test,				       \

				   KUNIT_EXPECTATION,			       \

				   KUNIT_ASSERTION,			       \

				   left, >, right,			       \

				   fmt,					       \

				    ##__VA_ARGS__)

tools/debugging/kernel-chktaint

+9 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ else 
	echo " * auxiliary taint, defined for and used by distros (#16)"



fi



T=`expr $T / 2`

if [ `expr $T % 2` -eq 0 ]; then

	addout " "
@@ -195,6 +196,14 @@ else 
	echo " * kernel was built with the struct randomization plugin (#17)"

fi



T=`expr $T / 2`

if [ `expr $T % 2` -eq 0 ]; then

	addout " "

else

	addout "N"

	echo " * an in-kernel test (such as a KUnit test) has been run (#18)"

fi



echo "For a more detailed explanation of the various taint flags see"

echo " Documentation/admin-guide/tainted-kernels.rst in the Linux kernel sources"

echo " or https://kernel.org/doc/html/latest/admin-guide/tainted-kernels.html"