Commit b9167c80 authored by Michael Ellerman's avatar Michael Ellerman Committed by Shuah Khan

selftests: Install settings files to fix TIMEOUT failures

Commit 852c8cbf ("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 b43e78f6 ("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: 852c8cbf ("selftests/kselftest/runner.sh: Add 45 second timeout per test")
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 68ca0fd2
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
all: all:
TEST_PROGS := ftracetest TEST_PROGS := ftracetest
TEST_FILES := test.d TEST_FILES := test.d settings
EXTRA_CLEAN := $(OUTPUT)/logs/* EXTRA_CLEAN := $(OUTPUT)/logs/*
include ../lib.mk include ../lib.mk
...@@ -8,4 +8,6 @@ TEST_PROGS := \ ...@@ -8,4 +8,6 @@ TEST_PROGS := \
test-state.sh \ test-state.sh \
test-ftrace.sh test-ftrace.sh
TEST_FILES := settings
include ../lib.mk include ../lib.mk
...@@ -8,6 +8,8 @@ TEST_PROGS := mptcp_connect.sh ...@@ -8,6 +8,8 @@ TEST_PROGS := mptcp_connect.sh
TEST_GEN_FILES = mptcp_connect TEST_GEN_FILES = mptcp_connect
TEST_FILES := settings
EXTRA_CLEAN := *.pcap EXTRA_CLEAN := *.pcap
include ../../lib.mk include ../../lib.mk
...@@ -19,6 +19,8 @@ TEST_GEN_PROGS_EXTENDED = librseq.so ...@@ -19,6 +19,8 @@ TEST_GEN_PROGS_EXTENDED = librseq.so
TEST_PROGS = run_param_test.sh TEST_PROGS = run_param_test.sh
TEST_FILES := settings
include ../lib.mk include ../lib.mk
$(OUTPUT)/librseq.so: rseq.c rseq.h rseq-*.h $(OUTPUT)/librseq.so: rseq.c rseq.h rseq-*.h
......
...@@ -6,4 +6,6 @@ TEST_GEN_PROGS = rtctest ...@@ -6,4 +6,6 @@ TEST_GEN_PROGS = rtctest
TEST_GEN_PROGS_EXTENDED = setdate TEST_GEN_PROGS_EXTENDED = setdate
TEST_FILES := settings
include ../lib.mk include ../lib.mk
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment