Commit 9195e5e0 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'linux-kselftest-fixes-5.17-rc5' of...

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
parents b3d971ec 6fec1ab6
...@@ -3,8 +3,8 @@ CFLAGS = -Wall ...@@ -3,8 +3,8 @@ CFLAGS = -Wall
CFLAGS += -Wno-nonnull CFLAGS += -Wno-nonnull
CFLAGS += -D_GNU_SOURCE CFLAGS += -D_GNU_SOURCE
TEST_PROGS := binfmt_script non-regular TEST_PROGS := binfmt_script
TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216 non-regular
TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir
# Makefile is a run-time dependency, since it's accessed by the execveat test # Makefile is a run-time dependency, since it's accessed by the execveat test
TEST_FILES := Makefile TEST_FILES := Makefile
......
...@@ -19,7 +19,7 @@ fail() { # mesg ...@@ -19,7 +19,7 @@ fail() { # mesg
FILTER=set_ftrace_filter FILTER=set_ftrace_filter
FUNC1="schedule" FUNC1="schedule"
FUNC2="do_softirq" FUNC2="scheduler_tick"
ALL_FUNCS="#### all functions enabled ####" ALL_FUNCS="#### all functions enabled ####"
......
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
CFLAGS += -Wl,-no-as-needed -Wall CFLAGS += -Wl,-no-as-needed -Wall -isystem ../../../../usr/include/
LDFLAGS += -lpthread LDFLAGS += -lpthread
TEST_GEN_PROGS := seccomp_bpf seccomp_benchmark TEST_GEN_PROGS := seccomp_bpf seccomp_benchmark
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment