Re: [PATCH 2/2] selftests/tracing: Fix to check the required syscall event

On Fri, 31 May 2024 08:41:00 -0600
Shuah Khan [off-list ref] wrote:

On 5/31/24 03:43, Masami Hiramatsu (Google) wrote:

quoted

From: Masami Hiramatsu (Google) <mhiramat@kernel.org>

Since test_duplicates.tc depends on syscalls/sys_enter_openat event,
it must add the event file to `requires`.
Without this fix, the test fails if CONFIG_FTRACE_SYSCALLS=n.

Fixes: 297e1dcdca3d ("selftests/ftrace: Add selftest for testing duplicate eprobes and kprobes")
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
---
  .../ftrace/test.d/dynevent/test_duplicates.tc      |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc
index d3a79da215c8..5f72abe6fa79 100644
--- a/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc
+++ b/tools/testing/selftests/ftrace/test.d/dynevent/test_duplicates.tc

@@ -1,7 +1,7 @@
  #!/bin/sh
  # SPDX-License-Identifier: GPL-2.0
  # description: Generic dynamic event - check if duplicate events are caught
-# requires: dynamic_events "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README
+# requires: dynamic_events "e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]":README events/syscalls/sys_enter_openat
  
  echo 0 > events/enable
  

This change is already in mainline. I sent the fix up in my 6.10-rc1 pr?

Oops, sorry, I forgot to pick it to my working branch...

Thanks!

The short log is a slightly different:

commit f6c3c83db1d939ebdb8c8922748ae647d8126d91
Author: Masami Hiramatsu (Google) [off-list ref]
Date:   Tue May 21 09:00:22 2024 +0900

     selftests/ftrace: Fix to check required event file
     
     The dynevent/test_duplicates.tc test case uses `syscalls/sys_enter_openat`
     event for defining eprobe on it. Since this `syscalls` events depend on
     CONFIG_FTRACE_SYSCALLS=y, if it is not set, the test will fail.
     
     Add the event file to `required` line so that the test will return
     `unsupported` result.
     
     Fixes: 297e1dcdca3d ("selftests/ftrace: Add selftest for testing duplicate eprobes and kprobes")
     Signed-off-by: Masami Hiramatsu (Google) [off-list ref]
     Signed-off-by: Shuah Khan [off-list ref]

thanks,
-- Shuah

-- 
Masami Hiramatsu (Google) [off-list ref]