Skip to content

Commit 2fcc741

Browse files
committed
Merge tag 'linux-kselftest-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fixes from Shuah Khan: - fixes to TIMEOUT failures and out-of-tree compilation compilation errors from Michael Ellerman. - declutter git status fix from Christophe Leroy * tag 'linux-kselftest-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/rseq: Fix out-of-tree compilation selftests: Install settings files to fix TIMEOUT failures selftest/lkdtm: Don't pollute 'git status'
2 parents cfe2ce4 + ef89d05 commit 2fcc741

File tree

6 files changed

+14
-2
lines changed

6 files changed

+14
-2
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ modules.order
100100
/include/ksym/
101101
/arch/*/include/generated/
102102

103+
# Generated lkdtm tests
104+
/tools/testing/selftests/lkdtm/*.sh
105+
!/tools/testing/selftests/lkdtm/run.sh
106+
103107
# stgit generated dirs
104108
patches-*
105109

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: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),)
44
CLANG_FLAGS += -no-integrated-as
55
endif
66

7-
CFLAGS += -O2 -Wall -g -I./ -I../../../../usr/include/ -L./ -Wl,-rpath=./ \
7+
CFLAGS += -O2 -Wall -g -I./ -I../../../../usr/include/ -L$(OUTPUT) -Wl,-rpath=./ \
88
$(CLANG_FLAGS)
99
LDLIBS += -lpthread
1010

@@ -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)