Commit 519d2962 authored May 03, 2017 by Kim Phillips Committed by Greg Kroah-Hartman Mar 24, 2018

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




[ Upstream commit 805b151a1afd24414706a7f6ae275fbb9649be74 ]

__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: 3c8a67f5 ("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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 2e483c87

tools/perf/tests/kmod-path.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ int test__kmod_path__parse(void)
		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");
		@@ -95,6 +96,7 @@ int test__kmod_path__parse(void)
		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);