diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-09-17 18:04:47 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-09-17 18:04:47 +0000 |
| commit | 58e5688a7517f13a134333c4610b98c67b20784b (patch) | |
| tree | 479020a46438e10aeb3e2668b62aadc115d161cf /tools | |
| parent | 628ae75fc1b45aa97bea8b979f833612efffbd4d (diff) | |
| parent | bdc3a8f6a8e8b798c46683a98b97d52b3a5708e4 (diff) | |
Merge tag 'v5.4.66' into 5.4-2.1.x-imx
This is the 5.4.66 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'tools')
| -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 |