Commit 75ec0ba2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull kselftest updates from Shuah Khan:

 - ftrace test fixes to check for required filter files and kprobe args.

 - Kselftest build/cross-build dependency check script to make it easier
   for test ring admins/users to configure build systems correctly for
   build/cross-build kselftests. Currently checks library dependencies.

    - Checks if Kselftests can be built/cross-built on a system running
      compile test on a trivial C file with LDLIBS specified for each
      individual test in their Makefiles.

    - Prints suggested target list for a system filtering out tests
      failed the build dependency check from the TARGETS in Selftests
      the main Makefile when optional -p is specified.

    - Prints pass/fail dependency check for each tests/sub-test.

    - Prints pass/fail targets and libraries.

    - Default: runs dependency checks on all tests.

    - Optional test name can be specified to check dependencies for it.

* tag 'linux-kselftest-5.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/ftrace: Check the first record for kprobe_args_type.tc
  selftests: add build/cross-build dependency check script
  selftests/ftrace: Check required filter files before running test
parents af4a32ad f0c0d0cf

tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc

+1 −4
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ if ! grep -q function_graph available_tracers; then 
    exit_unsupported

fi



if [ ! -f set_ftrace_filter ]; then

    echo "set_ftrace_filter not found? Is dynamic ftrace not set?"

    exit_unsupported

fi

check_filter_file set_ftrace_filter



do_reset() {

    if [ -e /proc/sys/kernel/stack_tracer_enabled ]; then

tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ if ! grep -q function_graph available_tracers; then 
    exit_unsupported

fi



check_filter_file set_ftrace_filter



fail() { # msg

    echo $1

    exit_fail

tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ if ! grep -q function available_tracers; then 
    exit_unsupported

fi



check_filter_file set_ftrace_filter



disable_tracing

clear_trace

tools/testing/selftests/ftrace/test.d/ftrace/func-filter-notrace-pid.tc

+1 −4
Original line number Diff line number Diff line
@@ -15,10 +15,7 @@ if [ ! -f set_ftrace_notrace_pid ]; then 
    exit_unsupported

fi



if [ ! -f set_ftrace_filter ]; then

    echo "set_ftrace_filter not found? Is function tracer not set?"

    exit_unsupported

fi

check_filter_file set_ftrace_filter



do_function_fork=1

tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ if [ ! -f set_ftrace_pid ]; then 
    exit_unsupported

fi



if [ ! -f set_ftrace_filter ]; then

    echo "set_ftrace_filter not found? Is function tracer not set?"

    exit_unsupported

fi

check_filter_file set_ftrace_filter



do_function_fork=1

CRA Git | Maintained and supported by SUSTech CRA and CCSE