lkml.org 
[lkml]   [2018]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH 1/2] perf tools: Make check-headers.sh check based on kernel dir
On Tue, Aug 14, 2018 at 11:47:39AM +1000, Michael Ellerman wrote:
> Jiri Olsa <jolsa@kernel.org> writes:
> > 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
> > @@ -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
>
> This breaks the build when sh is not bash:
>
> ./check-headers.sh: 91: ./check-headers.sh: pushd: not found
> ./check-headers.sh: 107: ./check-headers.sh: popd: not found
> Makefile.perf:205: recipe for target 'sub-make' failed

sry.. Arnaldo, would you change it for simple cd (attached below)
or should I send the fix?

thanks,
jirka


---
diff --git a/tools/perf/check-headers.sh b/tools/perf/check-headers.sh
index 80bf84803677..466540ee8ea7 100755
--- a/tools/perf/check-headers.sh
+++ b/tools/perf/check-headers.sh
@@ -88,7 +88,7 @@ check () {
# differences.
test -d ../../include || exit 0

-pushd ../.. > /dev/null
+cd ../..

# simple diff check
for i in $HEADERS; do
@@ -104,4 +104,4 @@ check include/uapi/linux/mman.h '-I "^#include <\(uapi/\)*asm/mman.h>"'
# diff non-symmetric files
check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl

-popd > /dev/null
+cd tools/perf
\
 
 \ /
  Last update: 2018-08-14 09:29    [W:0.071 / U:0.548 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site