| From b9167c8078c3527de6da241c8a1a75a9224ed90a Mon Sep 17 00:00:00 2001 |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Thu, 20 Feb 2020 15:42:41 +1100 |
| Subject: selftests: Install settings files to fix TIMEOUT failures |
| |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| |
| commit b9167c8078c3527de6da241c8a1a75a9224ed90a upstream. |
| |
| Commit 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second |
| timeout per test") added a 45 second timeout for tests, and also added |
| a way for tests to customise the timeout via a settings file. |
| |
| For example the ftrace tests take multiple minutes to run, so they |
| were given longer in commit b43e78f65b1d ("tracing/selftests: Turn off |
| timeout setting"). |
| |
| This works when the tests are run from the source tree. However if the |
| tests are installed with "make -C tools/testing/selftests install", |
| the settings files are not copied into the install directory. When the |
| tests are then run from the install directory the longer timeouts are |
| not applied and the tests timeout incorrectly. |
| |
| So add the settings files to TEST_FILES of the appropriate Makefiles |
| to cause the settings files to be installed using the existing install |
| logic. |
| |
| Fixes: 852c8cbf34d3 ("selftests/kselftest/runner.sh: Add 45 second timeout per test") |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/testing/selftests/ftrace/Makefile | 2 +- |
| tools/testing/selftests/livepatch/Makefile | 2 ++ |
| tools/testing/selftests/rseq/Makefile | 2 ++ |
| tools/testing/selftests/rtc/Makefile | 2 ++ |
| 4 files changed, 7 insertions(+), 1 deletion(-) |
| |
| --- a/tools/testing/selftests/ftrace/Makefile |
| +++ b/tools/testing/selftests/ftrace/Makefile |
| @@ -2,7 +2,7 @@ |
| all: |
| |
| TEST_PROGS := ftracetest |
| -TEST_FILES := test.d |
| +TEST_FILES := test.d settings |
| EXTRA_CLEAN := $(OUTPUT)/logs/* |
| |
| include ../lib.mk |
| --- a/tools/testing/selftests/livepatch/Makefile |
| +++ b/tools/testing/selftests/livepatch/Makefile |
| @@ -8,4 +8,6 @@ TEST_PROGS := \ |
| test-state.sh \ |
| test-ftrace.sh |
| |
| +TEST_FILES := settings |
| + |
| include ../lib.mk |
| --- a/tools/testing/selftests/rseq/Makefile |
| +++ b/tools/testing/selftests/rseq/Makefile |
| @@ -19,6 +19,8 @@ TEST_GEN_PROGS_EXTENDED = librseq.so |
| |
| TEST_PROGS = run_param_test.sh |
| |
| +TEST_FILES := settings |
| + |
| include ../lib.mk |
| |
| $(OUTPUT)/librseq.so: rseq.c rseq.h rseq-*.h |
| --- a/tools/testing/selftests/rtc/Makefile |
| +++ b/tools/testing/selftests/rtc/Makefile |
| @@ -6,4 +6,6 @@ TEST_GEN_PROGS = rtctest |
| |
| TEST_GEN_PROGS_EXTENDED = setdate |
| |
| +TEST_FILES := settings |
| + |
| include ../lib.mk |