perf tests probe_vfs_getname.sh: Update to use 'perf check feature'

In probe_vfs_getname.sh, current we use "perf record --dry-run"
to check for libtraceevent and skip the test if perf is not
build with libtraceevent. Change the check to use "perf check feature"
option

Signed-off-by: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Disha Goel <disgoel@linux.vnet.ibm.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/20240904190132.415212-6-adityag@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/tests/shell/lib/probe_vfs_getname.sh b/tools/perf/tests/shell/lib/probe_vfs_getname.sh
index b3802d9494b421221dc52724044519b0fc04cf34..0606e693eb59c5e933a9f4cb3215a58f8db17adf 100644 (file)
--- a/tools/perf/tests/shell/lib/probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/lib/probe_vfs_getname.sh
@@ -32,7 +32,7 @@ skip_if_no_debuginfo() {
 # check if perf is compiled with libtraceevent support
 skip_no_probe_record_support() {
        if [ $had_vfs_getname -eq 1 ] ; then
-               perf record --dry-run -e $1 2>&1 | grep "libtraceevent is necessary for tracepoint support" && return 2
-               return 1
+               perf check feature -q libtraceevent && return 1
+               return 2
        fi
 }

diff --git a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh
index 72c65570db378c74d562d6d361faa2d4c01760fd..f38c8ead0b03eef3ad773f6c3118e1f57140f03b 100755 (executable)
--- a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh
+++ b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh
@@ -63,7 +63,10 @@ trace_libc_inet_pton_backtrace() {
 
        # Check presence of libtraceevent support to run perf record
        skip_no_probe_record_support "$event_name/$eventattr/"
-       [ $? -eq 2 ] && return 2
+       if [ $? -eq 2 ]; then
+               echo "WARN: Skipping test trace_libc_inet_pton_backtrace. No libtraceevent support."
+               return 2
+       fi
 
        perf record -e $event_name/$eventattr/ -o $perf_data ping -6 -c 1 ::1 > /dev/null 2>&1
        # check if perf data file got created in above step.

diff --git a/tools/perf/tests/shell/record+script_probe_vfs_getname.sh b/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
index 5eedbe29bba1eab90b70cd9759106486eefa22a8..9a61928e3c9aa05fd5e8f3177b4129c7906cae13 100755 (executable)
--- a/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/record+script_probe_vfs_getname.sh
@@ -21,7 +21,10 @@ record_open_file() {
        echo "Recording open file:"
        # Check presence of libtraceevent support to run perf record
        skip_no_probe_record_support "probe:vfs_getname*"
-       [ $? -eq 2 ] && return 2
+       if [ $? -eq 2 ]; then
+               echo "WARN: Skipping test record_open_file. No libtraceevent support"
+               return 2
+       fi
        perf record -o ${perfdata} -e probe:vfs_getname\* touch $file
 }