diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-08 11:56:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-08 11:56:47 -0700 |
| commit | 34d4ddd359dbcdf6c5fb3f85a179243d7a1cb7f8 (patch) | |
| tree | a8749aa1113b2edb38bc9018a5dc778a075edd81 /tools/testing | |
| parent | d6dc7e06826bd7bbb654b7a730db99e7020abbf6 (diff) | |
| parent | 5c1e4f7e9e49b6925b1fb5c507d2c614f3edb292 (diff) | |
Merge tag 'linux-kselftest-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest fix from Shuah Khan:
"A single fix to timers test to disable timeout setting for tests to
run and report accurate results"
* tag 'linux-kselftest-5.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests/timers: Turn off timeout setting
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/timers/Makefile | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/timers/settings | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/testing/selftests/timers/Makefile b/tools/testing/selftests/timers/Makefile index 7656c7ce79d9..0e73a16874c4 100644 --- a/tools/testing/selftests/timers/Makefile +++ b/tools/testing/selftests/timers/Makefile @@ -13,6 +13,7 @@ DESTRUCTIVE_TESTS = alarmtimer-suspend valid-adjtimex adjtick change_skew \ TEST_GEN_PROGS_EXTENDED = $(DESTRUCTIVE_TESTS) +TEST_FILES := settings include ../lib.mk diff --git a/tools/testing/selftests/timers/settings b/tools/testing/selftests/timers/settings new file mode 100644 index 000000000000..e7b9417537fb --- /dev/null +++ b/tools/testing/selftests/timers/settings @@ -0,0 +1 @@ +timeout=0 |