From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756169AbdEDRzg (ORCPT ); Thu, 4 May 2017 13:55:36 -0400 Received: from terminus.zytor.com ([65.50.211.136]:41799 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752938AbdEDRz1 (ORCPT ); Thu, 4 May 2017 13:55:27 -0400 Date: Thu, 4 May 2017 10:50:51 -0700 From: tip-bot for Kim Phillips Message-ID: Cc: acme@redhat.com, peterz@infradead.org, hpa@zytor.com, jolsa@kernel.org, alexander.shishkin@linux.intel.com, kim.phillips@arm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org Reply-To: jolsa@kernel.org, acme@redhat.com, hpa@zytor.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, kim.phillips@arm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <20170503131402.c66e314460026c80cd787b34@arm.com> References: <20170503131402.c66e314460026c80cd787b34@arm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf tests kmod-path: Don't fail if compressed modules aren't supported Git-Commit-ID: 805b151a1afd24414706a7f6ae275fbb9649be74 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.c66e314460026c80cd787b34@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("/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);