From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272AbdHJQcK (ORCPT ); Thu, 10 Aug 2017 12:32:10 -0400 Received: from terminus.zytor.com ([65.50.211.136]:57619 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753161AbdHJQcI (ORCPT ); Thu, 10 Aug 2017 12:32:08 -0400 Date: Thu, 10 Aug 2017 09:29:49 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, adrian.hunter@intel.com, jolsa@kernel.org, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, namhyung@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com Reply-To: hpa@zytor.com, adrian.hunter@intel.com, jolsa@kernel.org, tglx@linutronix.de, mingo@kernel.org, wangnan0@huawei.com, acme@redhat.com, namhyung@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools perf: Do not check spaces/blank lines when checking header file copy drift Git-Commit-ID: 470de0f39e901611c366fc3d584307ba5d13406a 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: 470de0f39e901611c366fc3d584307ba5d13406a Gitweb: http://git.kernel.org/tip/470de0f39e901611c366fc3d584307ba5d13406a Author: Arnaldo Carvalho de Melo AuthorDate: Mon, 31 Jul 2017 22:55:12 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 31 Jul 2017 23:04:59 -0300 tools perf: Do not check spaces/blank lines when checking header file copy drift We copy headers from include/, arch/ to allow tools/ use defines, structs from newer kernels and still be able to build on older systems. We then, as part of a build, check if those copies got out of sync, when we emit a warning, so that we can check if something needs to be reflected on the tools, e.g. a 'perf trace' syscall argument beautifier needs tweaking. But we don't have to be super strict with that, for instance, extra spaces, tabs or blank lines aren't problematic, so change check-headers.sh to have "--ignore-blank-lines --ignore-space-change" as default "diff" arguments. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-d8emqpdc3m2qtzt1ei8ra2tf@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/check-headers.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index ff0a5fa..3f0c657 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -37,7 +37,7 @@ include/uapi/asm-generic/mman-common.h check () { file=$1 - opts= + opts="--ignore-blank-lines --ignore-space-change" shift while [ -n "$*" ]; do @@ -58,7 +58,7 @@ for i in $HEADERS; do done # diff with extra ignore lines -check arch/x86/lib/memcpy_64.S -B -I "^EXPORT_SYMBOL" -I "^#include " -check arch/x86/lib/memset_64.S -B -I "^EXPORT_SYMBOL" -I "^#include " -check include/uapi/asm-generic/mman.h -B -I "^#include <\(uapi/\)*asm-generic/mman-common.h>" -check include/uapi/linux/mman.h -B -I "^#include <\(uapi/\)*asm/mman.h>" +check arch/x86/lib/memcpy_64.S -I "^EXPORT_SYMBOL" -I "^#include " +check arch/x86/lib/memset_64.S -I "^EXPORT_SYMBOL" -I "^#include " +check include/uapi/asm-generic/mman.h -I "^#include <\(uapi/\)*asm-generic/mman-common.h>" +check include/uapi/linux/mman.h -I "^#include <\(uapi/\)*asm/mman.h>"