tools perf: Do not check spaces/blank lines when checking header file copy drift
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 470de0f39e901611c366fc3d584307ba5d13406a Gitweb: http://git.kernel.org/tip/470de0f39e901611c366fc3d584307ba5d13406a Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 31 Jul 2017 22:55:12 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> 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 <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/check-headers.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
tools/perf/check-headers.sh +5 -5
@@ -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 <asm/export.h>" -check arch/x86/lib/memset_64.S -B -I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" -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 <asm/export.h>" +check arch/x86/lib/memset_64.S -I "^EXPORT_SYMBOL" -I "^#include <asm/export.h>" +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>"