Merge branch 'master' into stylechecker

[mirror_frr.git] / tools / checkpatch.sh

diff --git a/tools/checkpatch.sh b/tools/checkpatch.sh
index 930c8e2df6bddb8a56c2ff6ff05ee9955ae04724..e6110f0c7ac6f16a2fa3889354e2e69d3a6029f3 100755 (executable)
--- a/tools/checkpatch.sh
+++ b/tools/checkpatch.sh
@@ -70,9 +70,9 @@ else
   echo "Done."
   for file in /tmp/f1/*_cp; do
     if [ -a /tmp/f2/$(basename $file) ]; then
-      result=$(diff $file /tmp/f2/$(basename $file) | grep -A3 "ERROR\|WARNING")
+      result=$(diff $file /tmp/f2/$(basename $file) | grep -A3 "ERROR\|WARNING" | grep -A2 -B2 '/tmp/f1')
     else
-      result=$(cat $file | grep -A4 "ERROR\|WARNING")
+      result=$(cat $file | grep -A3 "ERROR\|WARNING" | grep -A2 -B2 '/tmp/f1')
     fi
     if [ "$?" -eq "0" ]; then
       echo "Report for $(basename $file _cp)" 1>&2