• Alexander Kapshuk's avatar
    perf tools: Fix check-headers.sh AND list path of execution · 51d8aac2
    Alexander Kapshuk authored
    The '||' path of execution in the 'test' block of the check_2() function
    may also be taken if file2 does not exist, in which case the warning
    message about the ABI headers being different would still be printed
    where it should not be.  See below.
    
      % file1=file1; file2=file2
      % cmd="echo diff $file1 $file2"
      % test -f $file2 && \
        eval $cmd || echo "Warning: Kernel ABI header at 'tools/$file1'
                           differs from latest version at '$file2'" >&2
                           Warning: Kernel ABI header at 'tools/file1' differs from latest
                           version at 'file2'
    
    The proposed patch converts the code following the '&&' operator into a
    compound list to be executed in the current process environment only if file2
    does exist. Should the files being compared differ, a diff command to compare
    the files concerned is printed on standard output. E.g.
    
      $ diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S
    
    Committer testing:
    
    Remove a line from that tools/arch/x86/lib/memcpy_64.S file to test
    this:
    
      BUILD:   Doing 'make -j4' parallel build
    Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs from latest version at 'arch/x86/lib/memcpy_64.S'
    diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S
      CC       /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o
    Signed-off-by: default avatarAlexander Kapshuk <alexander.kapshuk@gmail.com>
    Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/20180811083915.17471-1-alexander.kapshuk@gmail.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
    51d8aac2
check-headers.sh 2.8 KB