Clang format: only show errors on non whitelisted files

minetest · Apr 6, 2017 · 503e1d2 · 503e1d2
1 parent 671d37a
commit 503e1d2
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/util/travis/script.sh b/util/travis/script.sh
@@ -22,19 +22,19 @@ function perform_lint() {
 		d=$(diff -u "$f" <(${CLANG_FORMAT} "$f") || true)
 
 		if ! [ -z "$d" ]; then
-			errorcount=$((errorcount+1))
-
-			printf "The file %s is not compliant with the coding style" "$f"
-			if [ ${errorcount} -gt 50 ]; then
-				printf "\nToo many errors encountered previously, this diff is hidden.\n"
-			else
-				printf ":\n%s\n" "$d"
-			fi
-
 			whitelisted=$(egrep -c "^${f}" "${CLANG_FORMAT_WHITELIST}")
 
 			# If file is not whitelisted, mark a failure
 			if [ ${whitelisted} -eq 0 ]; then
+				errorcount=$((errorcount+1))
+
+				printf "The file %s is not compliant with the coding style" "$f"
+				if [ ${errorcount} -gt 50 ]; then
+					printf "\nToo many errors encountered previously, this diff is hidden.\n"
+				else
+					printf ":\n%s\n" "$d"
+				fi
+
 				fail=1
 			fi
 		fi