Merge tag 'linux-kselftest-5.9-rc5' of git:https://git.kernel.org/pub/scm/l…

…inux/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:https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/timers: Turn off timeout setting
torvalds · Sep 8, 2020 · 34d4ddd · 34d4ddd
2 parents d6dc7e0 + 5c1e4f7
commit 34d4ddd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -0,0 +1 @@
+timeout=0