[tip:perf/core] perf tests: Run ctags/ cscope make tests only with needed binaries

2013-07-23 Thread tip-bot for Jiri Olsa
Commit-ID:  0659e66981ab137c11a746899672c886e1973a7b
Gitweb: http://git.kernel.org/tip/0659e66981ab137c11a746899672c886e1973a7b
Author: Jiri Olsa 
AuthorDate: Mon, 22 Jul 2013 14:43:30 +0200
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Mon, 22 Jul 2013 15:35:03 -0300

perf tests: Run ctags/cscope make tests only with needed binaries

Running tags and cscope make tests only if the 'ctags' and 'cscope'
binaries are installed, so we don't have false alarm test failures.

Signed-off-by: Jiri Olsa 
Cc: Borislav Petkov 
Cc: Corey Ashford 
Cc: David Ahern 
Cc: Frederic Weisbecker 
Cc: Namhyung Kim 
Cc: Paul Mackerras 
Cc: Peter Zijlstra 
Link: http://lkml.kernel.org/r/1374497014-2817-2-git-send-email-jo...@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/tests/make | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index c441a28..d1efef9 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -1,6 +1,8 @@
 PERF := .
 MK   := Makefile
 
+has = $(shell which $1 2>/dev/null)
+
 # standard single make variable specified
 make_clean_all  := clean all
 make_python_perf_so := python/perf.so
@@ -50,14 +52,19 @@ run += make_no_backtrace
 run += make_no_libnuma
 run += make_no_libaudit
 run += make_no_libbionic
-run += make_tags
-run += make_cscope
 run += make_help
 run += make_doc
 run += make_perf_o
 run += make_util_map_o
 run += make_minimal
 
+ifneq ($(call has,ctags),)
+run += make_tags
+endif
+ifneq ($(call has,cscope),)
+run += make_cscope
+endif
+
 # $(run_O) contains same portion of $(run) tests with '_O' attached
 # to distinguish O=... tests
 run_O := $(addsuffix _O,$(run))
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[tip:perf/core] perf tests: Run ctags/ cscope make tests only with needed binaries

2013-07-23 Thread tip-bot for Jiri Olsa
Commit-ID:  0659e66981ab137c11a746899672c886e1973a7b
Gitweb: http://git.kernel.org/tip/0659e66981ab137c11a746899672c886e1973a7b
Author: Jiri Olsa jo...@redhat.com
AuthorDate: Mon, 22 Jul 2013 14:43:30 +0200
Committer:  Arnaldo Carvalho de Melo a...@redhat.com
CommitDate: Mon, 22 Jul 2013 15:35:03 -0300

perf tests: Run ctags/cscope make tests only with needed binaries

Running tags and cscope make tests only if the 'ctags' and 'cscope'
binaries are installed, so we don't have false alarm test failures.

Signed-off-by: Jiri Olsa jo...@redhat.com
Cc: Borislav Petkov b...@alien8.de
Cc: Corey Ashford cjash...@linux.vnet.ibm.com
Cc: David Ahern dsah...@gmail.com
Cc: Frederic Weisbecker fweis...@gmail.com
Cc: Namhyung Kim namhy...@kernel.org
Cc: Paul Mackerras pau...@samba.org
Cc: Peter Zijlstra a.p.zijls...@chello.nl
Link: http://lkml.kernel.org/r/1374497014-2817-2-git-send-email-jo...@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo a...@redhat.com
---
 tools/perf/tests/make | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index c441a28..d1efef9 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -1,6 +1,8 @@
 PERF := .
 MK   := Makefile
 
+has = $(shell which $1 2/dev/null)
+
 # standard single make variable specified
 make_clean_all  := clean all
 make_python_perf_so := python/perf.so
@@ -50,14 +52,19 @@ run += make_no_backtrace
 run += make_no_libnuma
 run += make_no_libaudit
 run += make_no_libbionic
-run += make_tags
-run += make_cscope
 run += make_help
 run += make_doc
 run += make_perf_o
 run += make_util_map_o
 run += make_minimal
 
+ifneq ($(call has,ctags),)
+run += make_tags
+endif
+ifneq ($(call has,cscope),)
+run += make_cscope
+endif
+
 # $(run_O) contains same portion of $(run) tests with '_O' attached
 # to distinguish O=... tests
 run_O := $(addsuffix _O,$(run))
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/