tests: error rc in case of errors and warnings

Before, in case of new errors and new warnings, the script was exiting
with rc=250 (warning) instead of rc=1 (error).

This is fixed simply by looking at the warnings counter before the
errors one, so rc=1 will be set last.

Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>

Author: matttbe

tests/patch/pylint/pylint.sh

@@ -48,19 +48,19 @@ current_w=$(grep -i -c ": [WC][0-9][0-9][0-9][0-9]: " $tmpfile_n)
 
 echo "Errors before: $incumbent (+warn: $incumbent_w) this patch: $current (+warn: $current_w)" >&$DESC_FD
 
+if [ $current_w -gt $incumbent_w ]; then
+    echo "New warnings added" 1>&2
+
+    rc=250
+fi
+
 if [ $current -gt $incumbent ]; then
   echo "New errors added" 1>&2
   diff -U 0 $tmpfile_o $tmpfile_n 1>&2
 
   rc=1
 fi
 
-if [ $current_w -gt $incumbent_w ]; then
-    echo "New warnings added" 1>&2
-
-    rc=250
-fi
-
 rm "$tmpfile_o" "$tmpfile_n"
 
 exit $rc

tests/patch/shellcheck/shellcheck.sh

@@ -90,19 +90,19 @@ done
 
 echo "Errors before: $incumbent (+warn: $incumbent_w) this patch: $current (+warn: $current_w)" >&$DESC_FD
 
+if [ $current_w -gt $incumbent_w ]; then
+    echo "New warnings added" 1>&2
+
+    rc=250
+fi
+
 if [ $current -gt $incumbent ]; then
   echo "New errors added" 1>&2
   diff -U 0 $tmpfile_o $tmpfile_n 1>&2
 
   rc=1
 fi
 
-if [ $current_w -gt $incumbent_w ]; then
-    echo "New warnings added" 1>&2
-
-    rc=250
-fi
-
 rm "$tmpfile_o"* "$tmpfile_n"*
 
 exit $rc

tests/patch/yamllint/yamllint.sh

@@ -48,19 +48,19 @@ current_w=$(grep -i -c " warning " $tmpfile_n)
 
 echo "Errors before: $incumbent (+warn: $incumbent_w) this patch: $current (+warn: $current_w)" >&$DESC_FD
 
+if [ $current_w -gt $incumbent_w ]; then
+    echo "New warnings added" 1>&2
+
+    rc=250
+fi
+
 if [ $current -gt $incumbent ]; then
   echo "New errors added" 1>&2
   diff -U 0 $tmpfile_o $tmpfile_n 1>&2
 
   rc=1
 fi
 
-if [ $current_w -gt $incumbent_w ]; then
-    echo "New warnings added" 1>&2
-
-    rc=250
-fi
-
 rm "$tmpfile_o" "$tmpfile_n"
 
 exit $rc