[tip:perf/urgent] perf tests kmod-path: Don't fail if compressed modules aren't supported

2017-05-04 Thread tip-bot for Kim Phillips
Commit-ID:  805b151a1afd24414706a7f6ae275fbb9649be74
Gitweb: http://git.kernel.org/tip/805b151a1afd24414706a7f6ae275fbb9649be74
Author: Kim Phillips 
AuthorDate: Wed, 3 May 2017 13:14:02 +0100
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Thu, 4 May 2017 10:05:55 -0300

perf tests kmod-path: Don't fail if compressed modules aren't supported

__kmod_path__parse() uses is_supported_compression() to determine and
parse out compressed module file extensions.  On systems without zlib,
this test fails and __kmod_path__parse() continues to strcmp "ko" with
"gz".  Don't do this on those systems.

Signed-off-by: Kim Phillips 
Cc: Alexander Shishkin 
Cc: Jiri Olsa 
Cc: Peter Zijlstra 
Fixes: 3c8a67f50a1e ("perf tools: Add kmod_path__parse function")
Link: http://lkml.kernel.org/r/20170503131402.c66e314460026c80cd787...@arm.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/tests/kmod-path.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/tests/kmod-path.c b/tools/perf/tests/kmod-path.c
index 76f41f2..6cd9e51 100644
--- a/tools/perf/tests/kmod-path.c
+++ b/tools/perf/tests/kmod-path.c
@@ -61,6 +61,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
M("///x-x.ko", PERF_RECORD_MISC_KERNEL, true);
M("///x-x.ko", PERF_RECORD_MISC_USER, false);
 
+#ifdef HAVE_ZLIB_SUPPORT
/* pathalloc_name  alloc_ext   kmod  comp  name   ext */
T("///x.ko.gz", true , true  , true, true, "[x]", "gz");
T("///x.ko.gz", false, true  , true, true, NULL , "gz");
@@ -96,6 +97,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
M("x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
M("x.ko.gz", PERF_RECORD_MISC_KERNEL, true);
M("x.ko.gz", PERF_RECORD_MISC_USER, false);
+#endif
 
/* pathalloc_name  alloc_ext  kmod  comp   name 
ext */
T("[test_module]", true  , true , true, false, "[test_module]", 
NULL);


[tip:perf/urgent] perf tests kmod-path: Don't fail if compressed modules aren't supported

2017-05-04 Thread tip-bot for Kim Phillips
Commit-ID:  805b151a1afd24414706a7f6ae275fbb9649be74
Gitweb: http://git.kernel.org/tip/805b151a1afd24414706a7f6ae275fbb9649be74
Author: Kim Phillips 
AuthorDate: Wed, 3 May 2017 13:14:02 +0100
Committer:  Arnaldo Carvalho de Melo 
CommitDate: Thu, 4 May 2017 10:05:55 -0300

perf tests kmod-path: Don't fail if compressed modules aren't supported

__kmod_path__parse() uses is_supported_compression() to determine and
parse out compressed module file extensions.  On systems without zlib,
this test fails and __kmod_path__parse() continues to strcmp "ko" with
"gz".  Don't do this on those systems.

Signed-off-by: Kim Phillips 
Cc: Alexander Shishkin 
Cc: Jiri Olsa 
Cc: Peter Zijlstra 
Fixes: 3c8a67f50a1e ("perf tools: Add kmod_path__parse function")
Link: http://lkml.kernel.org/r/20170503131402.c66e314460026c80cd787...@arm.com
Signed-off-by: Arnaldo Carvalho de Melo 
---
 tools/perf/tests/kmod-path.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/tests/kmod-path.c b/tools/perf/tests/kmod-path.c
index 76f41f2..6cd9e51 100644
--- a/tools/perf/tests/kmod-path.c
+++ b/tools/perf/tests/kmod-path.c
@@ -61,6 +61,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
M("///x-x.ko", PERF_RECORD_MISC_KERNEL, true);
M("///x-x.ko", PERF_RECORD_MISC_USER, false);
 
+#ifdef HAVE_ZLIB_SUPPORT
/* pathalloc_name  alloc_ext   kmod  comp  name   ext */
T("///x.ko.gz", true , true  , true, true, "[x]", "gz");
T("///x.ko.gz", false, true  , true, true, NULL , "gz");
@@ -96,6 +97,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
M("x.ko.gz", PERF_RECORD_MISC_CPUMODE_UNKNOWN, true);
M("x.ko.gz", PERF_RECORD_MISC_KERNEL, true);
M("x.ko.gz", PERF_RECORD_MISC_USER, false);
+#endif
 
/* pathalloc_name  alloc_ext  kmod  comp   name 
ext */
T("[test_module]", true  , true , true, false, "[test_module]", 
NULL);