Messages in this thread Patch in this message | | | Date | Fri, 20 Jul 2018 11:57:45 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH 3/4] perf tools: Fix check-headers.sh output file variables |
| |
Em Fri, Jul 20, 2018 at 01:00:35PM +0200, Jiri Olsa escreveu: > The warning message in check_w function uses wrongly > the $file variable instead of $file1 and $file2.
Humm,
Before:
Warning: Kernel ABI header at 'tools/arch/powerpc/include/uapi/asm/unistd.h' differs from latest version at 'arch/powerpc/include/uapi/asm/unistd.h'
After:
Warning: Kernel ABI header at '../arch/powerpc/include/uapi/asm/unistd.h' differs from latest version at '../../arch/powerpc/include/uapi/asm/unistd.h'
The previous version is better, I can then just use:
diff -u tools/arch/powerpc/include/uapi/asm/unistd.h arch/powerpc/include/uapi/asm/unistd.h
and get what changed, with your change I have to go to tools/perf before doing that diff, which is an unnecessary extra step in at least my workflow.
- Arnaldo
> Fixes: 582472973593 ("perf check-headers.sh: Add support to check 2 independent files") > Link: http://lkml.kernel.org/n/tip-oh56ckqztoc07we7mtdphu7r@git.kernel.org > Signed-off-by: Jiri Olsa <jolsa@kernel.org> > --- > tools/perf/check-headers.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh > index 814aaf269949..73e723675c5f 100755 > --- a/tools/perf/check-headers.sh > +++ b/tools/perf/check-headers.sh > @@ -67,7 +67,7 @@ check_2 () { > cmd="diff $* $file1 $file2 > /dev/null" > > test -f $file2 && > - eval $cmd || echo "Warning: Kernel ABI header at 'tools/$file' differs from latest version at '$file'" >&2 > + eval $cmd || echo "Warning: Kernel ABI header at '$file1' differs from latest version at '$file2'" >&2 > } > > check () { > -- > 2.17.1
| |