Commit 1ab5c8a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-fixes-6.9-rc2' of... 

Merge tag 'linux_kselftest-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "Fixes to seccomp and ftrace tests and a change to add config file for
  dmabuf-heap test to increase coverage"

* tag 'linux_kselftest-fixes-6.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: dmabuf-heap: add config file for the test
  selftests/seccomp: Try to fit runtime of benchmark into timeout
  selftests/ftrace: Fix event filter target_func selection
parents a2ad5d9e 224fe424

tools/testing/selftests/dmabuf-heaps/config

0 → 100644
+3 −0
Original line number Diff line number Diff line 
CONFIG_DMABUF_HEAPS=y

CONFIG_DMABUF_HEAPS_SYSTEM=y

CONFIG_DRM_VGEM=y

tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ echo 0 > events/enable 
echo "Get the most frequently calling function"

sample_events



target_func=`cut -d: -f3 trace | sed 's/call_site=\([^+]*\)+0x.*/\1/' | sort | uniq -c | sort | tail -n 1 | sed 's/^[ 0-9]*//'`

target_func=`cat trace | grep -o 'call_site=\([^+]*\)' | sed 's/call_site=//' | sort | uniq -c | sort | tail -n 1 | sed 's/^[ 0-9]*//'`

if [ -z "$target_func" ]; then

    exit_fail

fi

tools/testing/selftests/seccomp/settings

+1 −1
Original line number Diff line number Diff line 
timeout=120
 
timeout=180