Skip to contentSkip to conversation

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

PATCH Applied Kim Phillips 2 participants 2 messages May 3, 2017 – May 4, 2017 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 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.

---
 tools/perf/tests/kmod-path.c | 2 ++
 1 file changed, 2 insertions(+)
tools/perf/tests/kmod-path.c +2 -0
index 76f41f2..6cd9e51 100644
@@ -61,6 +61,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
 	M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_KERNEL, true);
 	M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_USER, false);
 
+#ifdef HAVE_ZLIB_SUPPORT
 	/* path                alloc_name  alloc_ext   kmod  comp  name   ext */
 	T("/xxxx/xxxx/x.ko.gz", true     , true      , true, true, "[x]", "gz");
 	T("/xxxx/xxxx/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
 
 	/* path            alloc_name  alloc_ext  kmod  comp   name             ext */
 	T("[test_module]", true      , true     , true, false, "[test_module]", NULL);
Signature · 1 line
2.10.2
#1 lore raw

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

perf tests kmod-path: Don't fail if compressed modules aren't supported
Commit-ID:  805b151a1afd24414706a7f6ae275fbb9649be74
Gitweb:     http://git.kernel.org/tip/805b151a1afd24414706a7f6ae275fbb9649be74
Author:     Kim Phillips <[email protected]>
AuthorDate: Wed, 3 May 2017 13:14:02 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
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.

Cc Alexander Shishkin <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Peter Zijlstra <[email protected]>
Fixes 3c8a67f50a1e ("perf tools: Add kmod_path__parse function")
---
 tools/perf/tests/kmod-path.c | 2 ++
 1 file changed, 2 insertions(+)
tools/perf/tests/kmod-path.c +2 -0
index 76f41f2..6cd9e51 100644
@@ -61,6 +61,7 @@ int test__kmod_path__parse(int subtest __maybe_unused)
 	M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_KERNEL, true);
 	M("/xxxx/xxxx/x-x.ko", PERF_RECORD_MISC_USER, false);
 
+#ifdef HAVE_ZLIB_SUPPORT
 	/* path                alloc_name  alloc_ext   kmod  comp  name   ext */
 	T("/xxxx/xxxx/x.ko.gz", true     , true      , true, true, "[x]", "gz");
 	T("/xxxx/xxxx/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
 
 	/* path            alloc_name  alloc_ext  kmod  comp   name             ext */
 	T("[test_module]", true      , true     , true, false, "[test_module]", NULL);