Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ad5a182 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf test shell: Check if 'perf probe' is available, skip tests if not 



Add a library function that checks if 'perf probe' is built into the
tool being tested, skipping tests that need it.

Testing it on a system after removing the library needed to build
'probe' as a perf subcommand:

  # perf test ping vfs_getname
  59: Use vfs_getname probe to get syscall args filenames   : Skip
  60: probe libc's inet_pton & backtrace it with ping       : Skip
  61: Check open filename arg using perf trace + vfs_getname: Skip
  62: Add vfs_getname probe to get syscall args filenames   : Skip
  # perf probe
  perf: 'probe' is not a perf-command. See 'perf --help'.
  #

Now reinstalling elfutils-libelf-devel on this Fedora 26 system to
rebuild perf and then retest this:

  # perf test ping vfs_getname
  60: Use vfs_getname probe to get syscall args filenames   : Ok
  61: probe libc's inet_pton & backtrace it with ping       : Ok
  62: Check open filename arg using perf trace + vfs_getname: Ok
  63: Add vfs_getname probe to get syscall args filenames   : Ok
  #

Reported-by: default avatarKim Phillips <kim.phillips@arm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-ctdck2gzsskqhjzu3ebb62zm@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 06786963

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

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# Arnaldo Carvalho de Melo <acme@kernel.org>, 2017



skip_if_no_perf_probe() {

	perf probe |& grep -q 'is not a perf-command' && return 2

	return 0

}

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

+1 −1
Original line number Diff line number Diff line 
# Arnaldo Carvalho de Melo <acme@kernel.org>, 2017



perf probe -l | grep -q probe:vfs_getname

perf probe -l |& grep -q probe:vfs_getname

had_vfs_getname=$?



cleanup_probe_vfs_getname() {

tools/perf/tests/shell/probe_vfs_getname.sh

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
#

# Arnaldo Carvalho de Melo <acme@kernel.org>, 2017



. $(dirname $0)/lib/probe.sh



skip_if_no_perf_probe || exit 2



. $(dirname $0)/lib/probe_vfs_getname.sh



add_probe_vfs_getname || skip_if_no_debuginfo

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

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ 


# Arnaldo Carvalho de Melo <acme@kernel.org>, 2017



. $(dirname $0)/lib/probe.sh



skip_if_no_perf_probe || exit 2



. $(dirname $0)/lib/probe_vfs_getname.sh



perfdata=$(mktemp /tmp/__perf_test.perf.data.XXXXX)

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

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


# Arnaldo Carvalho de Melo <acme@kernel.org>, 2017



. $(dirname $0)/lib/probe.sh



trace_libc_inet_pton_backtrace() {

	idx=0

	expected[0]="PING.*bytes"
@@ -32,6 +34,7 @@ trace_libc_inet_pton_backtrace() { 
	done

}



skip_if_no_perf_probe && \

perf probe -q /lib64/libc-*.so inet_pton && \

trace_libc_inet_pton_backtrace

err=$?