From patchwork series 501395

https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=501395

Author: Fox Snowpatch

tools/perf/tests/shell/base_probe/test_adding_kernel.sh

@@ -23,10 +23,23 @@ TEST_RESULT=0
 . "$DIR_PATH/../lib/probe_vfs_getname.sh"
 
 TEST_PROBE=${TEST_PROBE:-"inode_permission"}
+PROBE_NO_LINE_CHECK=1
 
 # set NO_DEBUGINFO to skip testcase if debuginfo is not present
 # skip_if_no_debuginfo returns 2 if debuginfo is not present
-skip_if_no_debuginfo
+#
+# The perf probe checks which depends on presence of debuginfo and
+# used in this testcase are:
+# 1. probe add for inode_permission
+# 2. probe max-probes option using 'vfs_* $params'
+# 3. non-existing variable probing
+#
+# For these tests, probe check for specific line is not
+# required ( add_probe_vfs_getname does that ). So call
+# skip_if_no_debuginfo with argument as 1. This is to convey
+# that test only needs to check for debuginfo, and not specifically
+# line number
+skip_if_no_debuginfo $PROBE_NO_LINE_CHECK
 if [ $? -eq 2 ]; then
 	NO_DEBUGINFO=1
 fi

tools/perf/tests/shell/lib/probe_vfs_getname.sh

@@ -39,7 +39,18 @@ add_probe_vfs_getname() {
 }
 
 skip_if_no_debuginfo() {
-	add_probe_vfs_getname -v 2>&1 | grep -E -q "^(Failed to find the path for the kernel|Debuginfo-analysis is not supported)|(file has no debug information)" && return 2
+	no_line_check=$1
+	debug_str="^(Failed to find the path for the kernel|Debuginfo-analysis is not supported)|(file has no debug information)"
+
+	# search for debug_str using simple perf probe if the
+	# test only needs to check for debuginfo, and not specifically
+	# line number.
+	if [ $no_line_check -eq 1 ]; then
+		perf probe -vn --add 'inode_permission $params' 2>&1 | grep -E -q "$debug_str" && return 2
+	else
+		add_probe_vfs_getname -v 2>&1 | grep -E -q "$debug_str" && return 2
+	fi
+
 	return 1
 }
 

tools/perf/tests/shell/probe_vfs_getname.sh

@@ -16,8 +16,13 @@ skip_if_no_perf_probe || exit 2
 add_probe_vfs_getname
 err=$?
 
+# Invoke skip_if_no_debuginfo with argument as 0,
+# since the test needs suitable line number for getname
+# along with debuginfo check.
+# Argument "1" is used when to convey that test only needs to
+# check for debuginfo, and not specifically line number.
 if [ $err -eq 1 ] ; then
-	skip_if_no_debuginfo
+	skip_if_no_debuginfo 0
 	err=$?
 fi
 

tools/perf/tests/shell/record+script_probe_vfs_getname.sh

@@ -38,8 +38,13 @@ perf_script_filenames() {
 add_probe_vfs_getname
 err=$?
 
+# Invoke skip_if_no_debuginfo with argument as 0,
+# since the test needs suitable line number for getname
+# along with debuginfo check.
+# Argument "1" is used when to convey that test only needs to
+# check for debuginfo, and not specifically line number.
 if [ $err -eq 1 ] ; then
-        skip_if_no_debuginfo
+        skip_if_no_debuginfo 0
         err=$?
 fi
 

tools/perf/tests/shell/trace+probe_vfs_getname.sh

@@ -28,8 +28,13 @@ trace_open_vfs_getname() {
 add_probe_vfs_getname
 err=$?
 
+# Invoke skip_if_no_debuginfo with argument as 0,
+# since the test needs suitable line number for getname
+# along with debuginfo check.
+# Argument "1" is used when to convey that test only needs to
+# check for debuginfo, and not specifically line number.
 if [ $err -eq 1 ] ; then
-        skip_if_no_debuginfo
+        skip_if_no_debuginfo 0
         err=$?
 fi