tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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'

Linus Torvalds 2fcc7417 cfe2ce49

+14 -2
+4
.gitignore
··· 100 100 /include/ksym/ 101 101 /arch/*/include/generated/ 102 102 103 + # Generated lkdtm tests 104 + /tools/testing/selftests/lkdtm/*.sh 105 + !/tools/testing/selftests/lkdtm/run.sh 106 + 103 107 # stgit generated dirs 104 108 patches-* 105 109
+1 -1
tools/testing/selftests/ftrace/Makefile
··· 2 2 all: 3 3 4 4 TEST_PROGS := ftracetest 5 - TEST_FILES := test.d 5 + TEST_FILES := test.d settings 6 6 EXTRA_CLEAN := $(OUTPUT)/logs/* 7 7 8 8 include ../lib.mk
+2
tools/testing/selftests/livepatch/Makefile
··· 8 8 test-state.sh \ 9 9 test-ftrace.sh 10 10 11 + TEST_FILES := settings 12 + 11 13 include ../lib.mk
+2
tools/testing/selftests/net/mptcp/Makefile
··· 8 8 9 9 TEST_GEN_FILES = mptcp_connect 10 10 11 + TEST_FILES := settings 12 + 11 13 EXTRA_CLEAN := *.pcap 12 14 13 15 include ../../lib.mk
+3 -1
tools/testing/selftests/rseq/Makefile
··· 4 4 CLANG_FLAGS += -no-integrated-as 5 5 endif 6 6 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=./ \ 8 8 $(CLANG_FLAGS) 9 9 LDLIBS += -lpthread 10 10 ··· 18 18 TEST_GEN_PROGS_EXTENDED = librseq.so 19 19 20 20 TEST_PROGS = run_param_test.sh 21 + 22 + TEST_FILES := settings 21 23 22 24 include ../lib.mk 23 25
+2
tools/testing/selftests/rtc/Makefile
··· 6 6 7 7 TEST_GEN_PROGS_EXTENDED = setdate 8 8 9 + TEST_FILES := settings 10 + 9 11 include ../lib.mk