2019-02-15 16:18:46

by Tommi Rantala

Subject: [PATCH] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support

From: Tommi Rantala <[email protected]>

If perf was built without trace support, trace+probe_vfs_getname.sh
fails:

# perf trace -h
perf: 'trace' is not a perf-command. See 'perf --help'

# perf test 64
64: Check open filename arg using perf trace + vfs_getname: FAILED!

Check trace support, so that we'll skip the test:

# perf test 64
64: Check open filename arg using perf trace + vfs_getname: Skip

Signed-off-by: Tommi Rantala <[email protected]>
---
tools/perf/tests/shell/lib/probe.sh | 5 +++++
tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 +
2 files changed, 6 insertions(+)

diff --git a/tools/perf/tests/shell/lib/probe.sh b/tools/perf/tests/shell/lib/probe.sh
index 6293cc660947..e37787be672b 100644
--- a/tools/perf/tests/shell/lib/probe.sh
+++ b/tools/perf/tests/shell/lib/probe.sh
@@ -4,3 +4,8 @@ skip_if_no_perf_probe() {
perf probe 2>&1 | grep -q 'is not a perf-command' && return 2
return 0
}
+
+skip_if_no_perf_trace() {
+ perf trace -h 2>&1 | grep -q -e 'is not a perf-command' -e 'trace command not available' && return 2
+ return 0
+}
diff --git a/tools/perf/tests/shell/trace+probe_vfs_getname.sh b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
index 50109f27ca07..147efeb6b195 100755
--- a/tools/perf/tests/shell/trace+probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
@@ -12,6 +12,7 @@
. $(dirname $0)/lib/probe.sh

skip_if_no_perf_probe || exit 2
+skip_if_no_perf_trace || exit 2

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

--
2.20.1

2019-02-15 17:04:21

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support

Em Fri, Feb 15, 2019 at 03:42:46PM +0200, Tommi Rantala escreveu:
> From: Tommi Rantala <[email protected]>
>
> If perf was built without trace support, trace+probe_vfs_getname.sh
> fails:
>
> # perf trace -h
> perf: 'trace' is not a perf-command. See 'perf --help'
>
> # perf test 64
> 64: Check open filename arg using perf trace + vfs_getname: FAILED!
>
> Check trace support, so that we'll skip the test:
>
> # perf test 64
> 64: Check open filename arg using perf trace + vfs_getname: Skip

Thanks, applied.

- Arnaldo

2019-02-28 10:34:00

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/core] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support

Commit-ID: 83244772a4cf9490a54182be2f65f45d6b1a1ee8
Gitweb: https://git.kernel.org/tip/83244772a4cf9490a54182be2f65f45d6b1a1ee8
Author: Tommi Rantala <[email protected]>
AuthorDate: Fri, 15 Feb 2019 15:42:46 +0200
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 15 Feb 2019 13:42:26 -0300

perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support

If perf was built without trace support, the trace+probe_vfs_getname.sh
'perf test' entry fails:

# perf trace -h
perf: 'trace' is not a perf-command. See 'perf --help'

# perf test 64
64: Check open filename arg using perf trace + vfs_getname: FAILED!

Check trace support, so that we'll skip the test in that case:

# perf test 64
64: Check open filename arg using perf trace + vfs_getname: Skip

Signed-off-by: Tommi Rantala <[email protected]>
Cc: Alexander Shishkin <[email protected]>
Cc: Hendrik Brueckner <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Kim Phillips <[email protected]>
Cc: Michael Petlan <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/tests/shell/lib/probe.sh | 5 +++++
tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 +
2 files changed, 6 insertions(+)

diff --git a/tools/perf/tests/shell/lib/probe.sh b/tools/perf/tests/shell/lib/probe.sh
index 6293cc660947..e37787be672b 100644
--- a/tools/perf/tests/shell/lib/probe.sh
+++ b/tools/perf/tests/shell/lib/probe.sh
@@ -4,3 +4,8 @@ skip_if_no_perf_probe() {
perf probe 2>&1 | grep -q 'is not a perf-command' && return 2
return 0
}
+
+skip_if_no_perf_trace() {
+ perf trace -h 2>&1 | grep -q -e 'is not a perf-command' -e 'trace command not available' && return 2
+ return 0
+}
diff --git a/tools/perf/tests/shell/trace+probe_vfs_getname.sh b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
index 50109f27ca07..147efeb6b195 100755
--- a/tools/perf/tests/shell/trace+probe_vfs_getname.sh
+++ b/tools/perf/tests/shell/trace+probe_vfs_getname.sh
@@ -12,6 +12,7 @@
. $(dirname $0)/lib/probe.sh

skip_if_no_perf_probe || exit 2
+skip_if_no_perf_trace || exit 2

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