From 760bb7e86249e8e2db2a30a4ce92fe17e29cbd81 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Mon, 3 Dec 2018 13:51:56 -0700
Subject: [PATCH] check_format.sh: skip coding style checks if astyle is too
 old

check_format.sh isn't really function when astyle is too old - it
reports a bunch of style errors that don't really exist.  So just
skip running astyle in these cases.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ifee769a296791d11b1ec693d398922e87d76bb69

Reviewed-on: https://review.gerrithub.io/435960
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 scripts/check_format.sh | 45 +++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/scripts/check_format.sh b/scripts/check_format.sh
index b82e79f06..b439dd34e 100755
--- a/scripts/check_format.sh
+++ b/scripts/check_format.sh
@@ -63,30 +63,31 @@ if hash astyle; then
 	echo -n "Checking coding style..."
 	if [ "$(astyle -V)" \< "Artistic Style Version 3" ]
 	then
-		echo -n " Your astyle version is too old. This may cause failure on patch verification performed by CI. Please update astyle to at least 3.0.1 version..."
-	fi
-	rm -f astyle.log
-	touch astyle.log
-	# Exclude rte_vhost code imported from DPDK - we want to keep the original code
-	#  as-is to enable ongoing work to synch with a generic upstream DPDK vhost library,
-	#  rather than making diffs more complicated by a lot of changes to follow SPDK
-	#  coding standards.
-	git ls-files '*.[ch]' '*.cpp' '*.cc' '*.cxx' '*.hh' '*.hpp' | \
-		grep -v rte_vhost | grep -v cpp_headers | \
-		xargs -P$(nproc) -n10 astyle --options=.astylerc >> astyle.log
-	if grep -q "^Formatted" astyle.log; then
-		echo " errors detected"
-		git diff
-		sed -i -e 's/  / /g' astyle.log
-		grep --color=auto "^Formatted.*" astyle.log
-		echo "Incorrect code style detected in one or more files."
-		echo "The files have been automatically formatted."
-		echo "Remember to add the files to your commit."
-		rc=1
+		echo -n " Your astyle version is too old so skipping coding style checks. Please update astyle to at least 3.0.1 version..."
 	else
-		echo " OK"
+		rm -f astyle.log
+		touch astyle.log
+		# Exclude rte_vhost code imported from DPDK - we want to keep the original code
+		#  as-is to enable ongoing work to synch with a generic upstream DPDK vhost library,
+		#  rather than making diffs more complicated by a lot of changes to follow SPDK
+		#  coding standards.
+		git ls-files '*.[ch]' '*.cpp' '*.cc' '*.cxx' '*.hh' '*.hpp' | \
+			grep -v rte_vhost | grep -v cpp_headers | \
+			xargs -P$(nproc) -n10 astyle --options=.astylerc >> astyle.log
+		if grep -q "^Formatted" astyle.log; then
+			echo " errors detected"
+			git diff
+			sed -i -e 's/  / /g' astyle.log
+			grep --color=auto "^Formatted.*" astyle.log
+			echo "Incorrect code style detected in one or more files."
+			echo "The files have been automatically formatted."
+			echo "Remember to add the files to your commit."
+			rc=1
+		else
+			echo " OK"
+		fi
+		rm -f astyle.log
 	fi
-	rm -f astyle.log
 else
 	echo "You do not have astyle installed so your code style is not being checked!"
 fi