Commit 2fcc7417 authored Feb 26, 2020 by Linus Torvalds

Merge tag 'linux-kselftest-5.6-rc4' of...

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'

parents cfe2ce49 ef89d054

.gitignore

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -100,6 +100,10 @@ modules.order
	/include/ksym/		/include/ksym/
	/arch/*/include/generated/		/arch/*/include/generated/

			# Generated lkdtm tests
			/tools/testing/selftests/lkdtm/*.sh
			!/tools/testing/selftests/lkdtm/run.sh

	# stgit generated dirs		# stgit generated dirs
	patches-*		patches-*

tools/testing/selftests/ftrace/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

tools/testing/selftests/livepatch/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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

tools/testing/selftests/net/mptcp/Makefile

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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

tools/testing/selftests/rseq/Makefile

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@ ifneq ($(shell $(CC) --version 2>&1 \| head -n 1 \| grep clang),)
	CLANG_FLAGS += -no-integrated-as		CLANG_FLAGS += -no-integrated-as
	endif		endif

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

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