diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 22:43:10 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-29 22:43:10 +0300 |
| commit | 6f46e6fb4e267acf8741cb2c29d368b4de7b6c15 (patch) | |
| tree | 572119b967f50a4d7142b6bc210cbe865e907a30 /include | |
| parent | 22c5696e3fe029f4fc2decbe7cc6663b5d281223 (diff) | |
| parent | 34db4fba81916a2001d7a503dfcf718c08ed5c42 (diff) | |
| download | linux-6f46e6fb4e267acf8741cb2c29d368b4de7b6c15.tar.xz | |
Merge tag 'linux_kselftest-kunit-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kunit updates from Shuah Khan:
"Correct MODULE_IMPORT_NS() syntax documentation, make kunit_test
timeout configurable via a module parameter and a Kconfig option, fix
longest symbol length test, add a test for static stub, and adjust
kunit_test timeout based on test_{suite,case} speed"
* tag 'linux_kselftest-kunit-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
kunit: fix longest symbol length test
kunit: Make default kunit_test timeout configurable via both a module parameter and a Kconfig option
kunit: Adjust kunit_test timeout based on test_{suite,case} speed
kunit: Add test for static stub
Documentation: kunit: Correct MODULE_IMPORT_NS() syntax
Diffstat (limited to 'include')
| -rw-r--r-- | include/kunit/try-catch.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/kunit/try-catch.h b/include/kunit/try-catch.h index 7c966a1adbd3..d4e1a5b98ed6 100644 --- a/include/kunit/try-catch.h +++ b/include/kunit/try-catch.h @@ -47,6 +47,7 @@ struct kunit_try_catch { int try_result; kunit_try_catch_func_t try; kunit_try_catch_func_t catch; + unsigned long timeout; void *context; }; |