linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: namhyung@kernel.org, dsahern@gmail.com,
	alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org,
	alexander.kapshuk@gmail.com
Subject: [PATCH 1/2] perf tools: Make check-headers.sh check based on kernel dir
Date: Mon, 13 Aug 2018 13:15:03 +0200	[thread overview]
Message-ID: <20180813111504.3568-1-jolsa@kernel.org> (raw)
In-Reply-To: <20180811083915.17471-1-alexander.kapshuk@gmail.com>

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


  reply	other threads:[~2018-08-13 11:15 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-20 11:00 [PATCH 1/4] perf tools: Use perf_evsel__match in perf_evsel__is_bpf_output Jiri Olsa
2018-07-20 11:00 ` [PATCH 2/4] perf stat: Get rid of extra clock display function Jiri Olsa
2018-07-25 20:53   ` [tip:perf/core] " tip-bot for Jiri Olsa
2018-07-20 11:00 ` [PATCH 3/4] perf tools: Fix check-headers.sh output file variables Jiri Olsa
2018-07-20 14:57   ` Arnaldo Carvalho de Melo
2018-07-20 15:15     ` Jiri Olsa
2018-07-20 15:22       ` Alexander Kapshuk
2018-07-23  7:01         ` Jiri Olsa
     [not found]           ` <CAJ1xhMUZc88fJwdLL-SitEasyVnomcVHV6+vTyJYAcXGo10C5A@mail.gmail.com>
2018-07-26  6:22             ` Jiri Olsa
2018-08-11  8:39           ` [PATCH] perf tools: Fix check-headers.sh AND list path of execution Alexander Kapshuk
2018-08-13 11:15             ` Jiri Olsa [this message]
2018-08-13 11:15               ` [PATCH 2/2] perf tools: Move syscall_64.tbl check into check-headers.sh Jiri Olsa
2018-08-18 11:57                 ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2018-08-14  1:47               ` [PATCH 1/2] perf tools: Make check-headers.sh check based on kernel dir Michael Ellerman
2018-08-14  7:27                 ` Jiri Olsa
2018-08-14 18:06                   ` Arnaldo Carvalho de Melo
2018-08-14 23:11                     ` Jiri Olsa
2018-08-15 10:02                       ` Michael Ellerman
2018-08-15 15:01                         ` Arnaldo Carvalho de Melo
2018-08-16  1:35                           ` Michael Ellerman
2018-08-18 11:56                   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2018-08-13 11:16             ` [PATCH] perf tools: Fix check-headers.sh AND list path of execution Jiri Olsa
2018-08-13 11:19               ` Alexander Kapshuk
2018-08-13 18:58                 ` Arnaldo Carvalho de Melo
2018-08-14  6:12                   ` Alexander Kapshuk
2018-08-18 11:56             ` [tip:perf/urgent] " tip-bot for Alexander Kapshuk
2018-07-20 11:00 ` [PATCH 4/4] perf tools: Move syscall_64.tbl check into check-headers.sh Jiri Olsa
2018-07-20 15:03   ` Arnaldo Carvalho de Melo
2018-07-20 15:14     ` Jiri Olsa
2018-07-25 20:52 ` [tip:perf/core] perf tools: Use perf_evsel__match instead of open coded equivalent tip-bot for Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180813111504.3568-1-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=alexander.kapshuk@gmail.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=dsahern@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).