All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support
@ 2019-02-15 13:42 Tommi Rantala
  2019-02-15 16:43 ` Arnaldo Carvalho de Melo
  2019-02-28  7:37 ` [tip:perf/core] " tip-bot for Tommi Rantala
  0 siblings, 2 replies; 3+ messages in thread
From: Tommi Rantala @ 2019-02-15 13:42 UTC (permalink / raw)
  To: linux-kernel
  Cc: Tommi Rantala, Peter Zijlstra, Ingo Molnar,
	Arnaldo Carvalho de Melo, Alexander Shishkin, Jiri Olsa,
	Namhyung Kim, Hendrik Brueckner, Michael Petlan, Kim Phillips

From: Tommi Rantala <tommi.t.rantala@nokia.com>

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 <tommi.t.rantala@nokia.com>
---
 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support
  2019-02-15 13:42 [PATCH] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support Tommi Rantala
@ 2019-02-15 16:43 ` Arnaldo Carvalho de Melo
  2019-02-28  7:37 ` [tip:perf/core] " tip-bot for Tommi Rantala
  1 sibling, 0 replies; 3+ messages in thread
From: Arnaldo Carvalho de Melo @ 2019-02-15 16:43 UTC (permalink / raw)
  To: Tommi Rantala
  Cc: linux-kernel, Tommi Rantala, Peter Zijlstra, Ingo Molnar,
	Alexander Shishkin, Jiri Olsa, Namhyung Kim, Hendrik Brueckner,
	Michael Petlan, Kim Phillips

Em Fri, Feb 15, 2019 at 03:42:46PM +0200, Tommi Rantala escreveu:
> From: Tommi Rantala <tommi.t.rantala@nokia.com>
> 
> 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

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [tip:perf/core] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support
  2019-02-15 13:42 [PATCH] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support Tommi Rantala
  2019-02-15 16:43 ` Arnaldo Carvalho de Melo
@ 2019-02-28  7:37 ` tip-bot for Tommi Rantala
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Tommi Rantala @ 2019-02-28  7:37 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: namhyung, mingo, tglx, jolsa, tommi.t.rantala, kim.phillips,
	brueckner, alexander.shishkin, peterz, linux-kernel, acme,
	mpetlan, hpa

Commit-ID:  83244772a4cf9490a54182be2f65f45d6b1a1ee8
Gitweb:     https://git.kernel.org/tip/83244772a4cf9490a54182be2f65f45d6b1a1ee8
Author:     Tommi Rantala <tommi.t.rantala@nokia.com>
AuthorDate: Fri, 15 Feb 2019 15:42:46 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <tommi.t.rantala@nokia.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Hendrik Brueckner <brueckner@linux.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190215134253.11454-1-tt.rantala@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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
 

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-28  7:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-15 13:42 [PATCH] perf tests shell: Skip trace+probe_vfs_getname.sh if built without trace support Tommi Rantala
2019-02-15 16:43 ` Arnaldo Carvalho de Melo
2019-02-28  7:37 ` [tip:perf/core] " tip-bot for Tommi Rantala

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.