* [PATCH 3/3] perf tests kmod-path: don't fail if compressed modules aren't supported
@ 2017-05-03 12:14 Kim Phillips
2017-05-04 17:50 ` [tip:perf/urgent] perf tests kmod-path: Don't " tip-bot for Kim Phillips
0 siblings, 1 reply; 2+ messages in thread
From: Kim Phillips @ 2017-05-03 12:14 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Peter Zijlstra, Ingo Molnar,
Alexander Shishkin
Cc: linux-kernel
__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 <kim.phillips@arm.com>
---
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("/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);
--
2.10.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:perf/urgent] perf tests kmod-path: Don't fail if compressed modules aren't supported
2017-05-03 12:14 [PATCH 3/3] perf tests kmod-path: don't fail if compressed modules aren't supported Kim Phillips
@ 2017-05-04 17:50 ` tip-bot for Kim Phillips
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Kim Phillips @ 2017-05-04 17:50 UTC (permalink / raw)
To: linux-tip-commits
Cc: acme, peterz, hpa, jolsa, alexander.shishkin, kim.phillips,
linux-kernel, tglx, mingo
Commit-ID: 805b151a1afd24414706a7f6ae275fbb9649be74
Gitweb: http://git.kernel.org/tip/805b151a1afd24414706a7f6ae275fbb9649be74
Author: Kim Phillips <kim.phillips@arm.com>
AuthorDate: Wed, 3 May 2017 13:14:02 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
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 <kim.phillips@arm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 3c8a67f50a1e ("perf tools: Add kmod_path__parse function")
Link: http://lkml.kernel.org/r/20170503131402.c66e314460026c80cd787b34@arm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
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("/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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-04 17:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-03 12:14 [PATCH 3/3] perf tests kmod-path: don't fail if compressed modules aren't supported Kim Phillips
2017-05-04 17:50 ` [tip:perf/urgent] perf tests kmod-path: Don't " tip-bot for Kim Phillips
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.