From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422655AbcKPIOH (ORCPT ); Wed, 16 Nov 2016 03:14:07 -0500 Received: from mail.kernel.org ([198.145.29.136]:42004 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932414AbcKPIOD (ORCPT ); Wed, 16 Nov 2016 03:14:03 -0500 From: Masami Hiramatsu To: Steven Rostedt , Shuah Khan Cc: Masami Hiramatsu , Shuah Khan , linux-kernel@vger.kernel.org, Ingo Molnar , Namhyung Kim , Tom Zanussi , linux-kselftest@vger.kernel.org Subject: [PATCH -tip v3 5/9] selftests: ftrace: Fix trigger-mod to run without syscall trace Date: Wed, 16 Nov 2016 17:13:47 +0900 Message-Id: <147928402670.22982.15589445159052676877.stgit@devbox> X-Mailer: git-send-email 2.7.4 In-Reply-To: <147928393441.22982.15432364313721641355.stgit@devbox> References: <147928393441.22982.15432364313721641355.stgit@devbox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since histogram trigger id.syscall depends on CONFIG_FTRACE_SYSCALLS, a testcase in trigger-modifier test fails if that config is disabled. Fix this bug by using flexible pattern to check the histogram output. Signed-off-by: Masami Hiramatsu --- .../ftrace/test.d/trigger/trigger-hist-mod.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc index 0bf5085..400e98b 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc @@ -56,7 +56,7 @@ echo "Test histogram with syscall modifier" echo 'hist:keys=id.syscall' > events/raw_syscalls/sys_exit/trigger for i in `seq 1 10` ; do ( echo "forked" > /dev/null); done -grep "id: sys_" events/raw_syscalls/sys_exit/hist > /dev/null || \ +grep "id: \(unknown_\|sys_\)" events/raw_syscalls/sys_exit/hist > /dev/null || \ fail "syscall modifier on raw_syscalls/sys_exit did not work"