| Message ID | c9b1f203-a8b6-479f-86c2-49d6aac378bf@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1ab5c8a338c470ceda8221e3a00ad0fc0a3be55b |
| Headers | show |
| Series | [GIT,PULL] Kselftest fixes update for Linux 6.9-rc2 | expand |
The pull request you sent on Fri, 29 Mar 2024 14:19:52 -0600:
> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.9-rc2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1ab5c8a338c470ceda8221e3a00ad0fc0a3be55b
Thank you!
diff --git a/tools/testing/selftests/dmabuf-heaps/config b/tools/testing/selftests/dmabuf-heaps/config new file mode 100644 index 000000000000..be091f1cdfa0 --- /dev/null +++ b/tools/testing/selftests/dmabuf-heaps/config @@ -0,0 +1,3 @@ +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DRM_VGEM=y diff --git a/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc b/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc index 2de7c61d1ae3..3f74c09c56b6 100644 --- a/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc +++ b/tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc @@ -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 diff --git a/tools/testing/selftests/seccomp/settings b/tools/testing/selftests/seccomp/settings index 6091b45d226b..a953c96aa16e 100644 --- a/tools/testing/selftests/seccomp/settings +++ b/tools/testing/selftests/seccomp/settings @@ -1 +1 @@ -timeout=120 +timeout=180
Hi Linus, Please pull the following kselftest fixes update for Linux 6.9rc2. This kselftest fixes update for Linux 6.9-rc2 consists of fixes to seccomp and ftrace tests and a change to add config file for dmabuf-heap test to increase coverage. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 4cece764965020c22cff7665b18a012006359095: Linux 6.9-rc1 (2024-03-24 14:10:05 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.9-rc2 for you to fetch changes up to 224fe424c356cb5c8f451eca4127f32099a6f764: selftests: dmabuf-heap: add config file for the test (2024-03-29 13:57:14 -0600) ---------------------------------------------------------------- linux_kselftest-fixes-6.9-rc2 This kselftest fixes update for Linux 6.9-rc2 consists of fixes to seccomp and ftrace tests and a change to add config file for dmabuf-heap test to increase coverage. ---------------------------------------------------------------- Mark Brown (1): selftests/seccomp: Try to fit runtime of benchmark into timeout Mark Rutland (1): selftests/ftrace: Fix event filter target_func selection Muhammad Usama Anjum (1): selftests: dmabuf-heap: add config file for the test tools/testing/selftests/dmabuf-heaps/config | 3 +++ tools/testing/selftests/ftrace/test.d/filter/event-filter-function.tc | 2 +- tools/testing/selftests/seccomp/settings | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/dmabuf-heaps/config ----------------------------------------------------------------