leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2022-09-09 14:13:36 -04:00
parent 22b2e2d6ab 2a2dfc869d
commit e35ff25f9f
4 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/thunderbolt/Kconfig
View File

@@ -29,8 +29,7 @@ config USB4_DEBUGFS_WRITE
config USB4_KUNIT_TEST config USB4_KUNIT_TEST
bool "KUnit tests" if !KUNIT_ALL_TESTS bool "KUnit tests" if !KUNIT_ALL_TESTS
depends on (USB4=m || KUNIT=y) depends on USB4 && KUNIT=y
depends on KUNIT
default KUNIT_ALL_TESTS default KUNIT_ALL_TESTS
config USB4_DMA_TEST config USB4_DMA_TEST

2
drivers/virt/nitro_enclaves/Kconfig
View File

@@ -17,7 +17,7 @@ config NITRO_ENCLAVES
config NITRO_ENCLAVES_MISC_DEV_TEST config NITRO_ENCLAVES_MISC_DEV_TEST
bool "Tests for the misc device functionality of the Nitro Enclaves" if !KUNIT_ALL_TESTS 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 default KUNIT_ALL_TESTS
help help
Enable KUnit tests for the misc device functionality of the Nitro Enable KUnit tests for the misc device functionality of the Nitro

6
include/kunit/test.h
View File

@@ -826,7 +826,7 @@ do { \
#define KUNIT_EXPECT_LE_MSG(test, left, right, fmt, ...) \ #define KUNIT_EXPECT_LE_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_INT_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_ASSERTION, \ KUNIT_EXPECTATION, \
left, <=, right, \ left, <=, right, \
fmt, \ fmt, \
##__VA_ARGS__) ##__VA_ARGS__)
@@ -1116,7 +1116,7 @@ do { \
#define KUNIT_ASSERT_LT_MSG(test, left, right, fmt, ...) \ #define KUNIT_ASSERT_LT_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_INT_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_EXPECTATION, \ KUNIT_ASSERTION, \
left, <, right, \ left, <, right, \
fmt, \ fmt, \
##__VA_ARGS__) ##__VA_ARGS__)
@@ -1157,7 +1157,7 @@ do { \
#define KUNIT_ASSERT_GT_MSG(test, left, right, fmt, ...) \ #define KUNIT_ASSERT_GT_MSG(test, left, right, fmt, ...) \
KUNIT_BINARY_INT_ASSERTION(test, \ KUNIT_BINARY_INT_ASSERTION(test, \
KUNIT_EXPECTATION, \ KUNIT_ASSERTION, \
left, >, right, \ left, >, right, \
fmt, \ fmt, \
##__VA_ARGS__) ##__VA_ARGS__)

9
tools/debugging/kernel-chktaint
View File

@@ -187,6 +187,7 @@ else
echo " * auxiliary taint, defined for and used by distros (#16)" echo " * auxiliary taint, defined for and used by distros (#16)"
fi fi
T=`expr $T / 2` T=`expr $T / 2`
if [ `expr $T % 2` -eq 0 ]; then if [ `expr $T % 2` -eq 0 ]; then
addout " " addout " "
@@ -195,6 +196,14 @@ else
echo " * kernel was built with the struct randomization plugin (#17)" echo " * kernel was built with the struct randomization plugin (#17)"
fi 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 "For a more detailed explanation of the various taint flags see"
echo " Documentation/admin-guide/tainted-kernels.rst in the Linux kernel sources" 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" echo " or https://kernel.org/doc/html/latest/admin-guide/tainted-kernels.html"