Messages in this thread Patch in this message | | | From | Jiri Olsa <> | Subject | [PATCH 1/2] perf tools: Make check-headers.sh check based on kernel dir | Date | Mon, 13 Aug 2018 13:15:03 +0200 |
| |
Changing the logic to compare files with paths relative to kernel source base dir. This way we can keep the output message for 2 unrelated files, which is coming in following patch.
Link: http://lkml.kernel.org/n/tip-gpfv1vdqfjda80m451w9a7mt@git.kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/perf/check-headers.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh index ea48aa6f8d19..9d466e853aec 100755 --- a/tools/perf/check-headers.sh +++ b/tools/perf/check-headers.sh @@ -69,8 +69,8 @@ check_2 () { test -f $file2 && { eval $cmd || { - echo "Warning: Kernel ABI header at 'tools/$file' differs from latest version at '$file'" >&2 - echo diff -u tools/$file $file + echo "Warning: Kernel ABI header at '$file1' differs from latest version at '$file2'" >&2 + echo diff -u $file1 $file2 } } } @@ -80,7 +80,7 @@ check () { shift - check_2 ../$file ../../$file $* + check_2 tools/$file $file $* } # Check if we have the kernel headers (tools/perf/../../include), else @@ -88,6 +88,8 @@ check () { # differences. test -d ../../include || exit 0 +pushd ../.. > /dev/null + # simple diff check for i in $HEADERS; do check $i -B @@ -98,3 +100,5 @@ check arch/x86/lib/memcpy_64.S '-I "^EXPORT_SYMBOL" -I "^#include <asm/ex 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>"' + +popd > /dev/null -- 2.17.1
| |