Skip to content

Commit 9195e5e

Browse files
committed
Merge tag 'linux-kselftest-fixes-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fixes from Shuah Khan: "Fixes to ftrace, exec, and seccomp tests build, run-time and install bugs. These bugs are in the way of running the tests" * tag 'linux-kselftest-fixes-5.17-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: selftests/ftrace: Do not trace do_softirq because of PREEMPT_RT selftests/seccomp: Fix seccomp failure by adding missing headers selftests/exec: Add non-regular to TEST_GEN_PROGS
2 parents b3d971e + 6fec1ab commit 9195e5e

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

tools/testing/selftests/exec/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ CFLAGS = -Wall
33
CFLAGS += -Wno-nonnull
44
CFLAGS += -D_GNU_SOURCE
55

6-
TEST_PROGS := binfmt_script non-regular
7-
TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216
6+
TEST_PROGS := binfmt_script
7+
TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 non-regular
88
TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir
99
# Makefile is a run-time dependency, since it's accessed by the execveat test
1010
TEST_FILES := Makefile

tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fail() { # mesg
1919

2020
FILTER=set_ftrace_filter
2121
FUNC1="schedule"
22-
FUNC2="do_softirq"
22+
FUNC2="scheduler_tick"
2323

2424
ALL_FUNCS="#### all functions enabled ####"
2525

tools/testing/selftests/seccomp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
CFLAGS += -Wl,-no-as-needed -Wall
2+
CFLAGS += -Wl,-no-as-needed -Wall -isystem ../../../../usr/include/
33
LDFLAGS += -lpthread
44

55
TEST_GEN_PROGS := seccomp_bpf seccomp_benchmark

0 commit comments

Comments
 (0)