diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-12 09:10:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-09-12 09:10:36 -0700 |
| commit | a747acc0b752f6c3911be539a2d3ca42b4424844 (patch) | |
| tree | 44ca1a10e7cf10694221688eeefcf9855850f063 /tools/testing/selftests/kselftest/runner.sh | |
| parent | fb52c87a06324e3a9223bf7bb3b087557524f96e (diff) | |
| parent | 3f3f384139ed147c71e1d770accf610133d5309b (diff) | |
Merge tag 'linux-kselftest-next-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fixes from Shuah Khan:
- kselftest runner script to propagate SIGTERM to runner child
to avoid kselftest hang
- install symlinks required for test execution to avoid test
failures
- kselftest dependency checker script argument parsing
* tag 'linux-kselftest-next-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: Keep symlinks, when possible
selftests: fix dependency checker script
kselftest/runner.sh: Propagate SIGTERM to runner child
selftests/ftrace: Correctly enable event in instance-event.tc
Diffstat (limited to 'tools/testing/selftests/kselftest/runner.sh')
| -rw-r--r-- | tools/testing/selftests/kselftest/runner.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh index 261c73cab41b..cd2fb43eea61 100644 --- a/tools/testing/selftests/kselftest/runner.sh +++ b/tools/testing/selftests/kselftest/runner.sh @@ -36,7 +36,8 @@ tap_timeout() { # Make sure tests will time out if utility is available. if [ -x /usr/bin/timeout ] ; then - /usr/bin/timeout --foreground "$kselftest_timeout" $1 + /usr/bin/timeout --foreground "$kselftest_timeout" \ + /usr/bin/timeout "$kselftest_timeout" $1 else $1 fi |