xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'linux-kselftest-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Browse Source 
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'
This commit is contained in:
Linus Torvalds
2020-02-26 10:06:56 -08:00
parent cfe2ce49b9 ef89d05451
commit 2fcc74178f
6 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

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

2
tools/testing/selftests/ftrace/Makefile
View File

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

2
tools/testing/selftests/livepatch/Makefile
View File

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

2
tools/testing/selftests/net/mptcp/Makefile
View File

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

4
tools/testing/selftests/rseq/Makefile
View File

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

2
tools/testing/selftests/rtc/Makefile
View File

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