Skip to content

Commit b9167c8

Browse files
mpeshuahkh
authored andcommitted
selftests: Install settings files to fix TIMEOUT failures
Commit 852c8cb ("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 b43e78f ("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: 852c8cb ("selftests/kselftest/runner.sh: Add 45 second timeout per test") Signed-off-by: Michael Ellerman <[email protected]> Signed-off-by: Shuah Khan <[email protected]>
1 parent 68ca0fd commit b9167c8

File tree

5 files changed

+9
-1
lines changed

5 files changed

+9
-1
lines changed

tools/testing/selftests/ftrace/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
all:
33

44
TEST_PROGS := ftracetest
5-
TEST_FILES := test.d
5+
TEST_FILES := test.d settings
66
EXTRA_CLEAN := $(OUTPUT)/logs/*
77

88
include ../lib.mk

tools/testing/selftests/livepatch/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ TEST_PROGS := \
88
test-state.sh \
99
test-ftrace.sh
1010

11+
TEST_FILES := settings
12+
1113
include ../lib.mk

tools/testing/selftests/net/mptcp/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ TEST_PROGS := mptcp_connect.sh
88

99
TEST_GEN_FILES = mptcp_connect
1010

11+
TEST_FILES := settings
12+
1113
EXTRA_CLEAN := *.pcap
1214

1315
include ../../lib.mk

tools/testing/selftests/rseq/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ TEST_GEN_PROGS_EXTENDED = librseq.so
1919

2020
TEST_PROGS = run_param_test.sh
2121

22+
TEST_FILES := settings
23+
2224
include ../lib.mk
2325

2426
$(OUTPUT)/librseq.so: rseq.c rseq.h rseq-*.h

tools/testing/selftests/rtc/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ TEST_GEN_PROGS = rtctest
66

77
TEST_GEN_PROGS_EXTENDED = setdate
88

9+
TEST_FILES := settings
10+
911
include ../lib.mk

0 commit comments

Comments
 (0)