Commit 38d41acd authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

check_format: check Python style with pep8 



Also continue checking for errors after a problem has been found.

Change-Id: Iea37311e54f68fb6ba8c804ad4b2fb92d5238f36
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 82395855

scripts/check_format.sh

+35 −7
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ cd $BASEDIR 
# exit on errors

set -e



rc=0



if hash astyle; then

	echo -n "Checking coding style..."

	rm -f astyle.log
@@ -21,17 +23,43 @@ if hash astyle; then 
		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."

		rm -f astyle.log

		exit 1

	fi

		rc=1

	else

		echo " OK"

	fi

	rm -f astyle.log

else

	echo "You do not have astyle installed so your code style is not being checked!"

	exit 0

fi



git grep -I -l -e . -z | \

	xargs -0 -P8 -n1 scripts/eofnl

echo -n "Checking blank lines at end of file..."



if ! git grep -I -l -e . -z | \

	xargs -0 -P8 -n1 scripts/eofnl > eofnl.log; then

	echo " Incorrect end-of-file formatting detected"

	cat eofnl.log

	rc=1

else

	echo " OK"

fi

rm -f eofnl.log



if hash pep8; then

	echo -n "Checking Python style..."



	PEP8_ARGS+=" --ignore=E302" # ignore 'E302 expected 2 blank lines, found 1'

	PEP8_ARGS+=" --max-line-length=140"



	error=0

	git ls-files '*.py' | xargs -n1 pep8 $PEP8_ARGS > pep8.log || error=1

	if [ $error -ne 0 ]; then

		echo " Python formatting errors detected"

		cat pep8.log

		rc=1

	else

		echo " OK"

	fi

	rm -f pep8.log

fi



exit 0
 
exit $rc

scripts/rpc.py

+1 −1

File changed.

Contains only whitespace changes.

test/iscsi_tgt/rpc_config/rpc_config.py

+1 −1

File changed.

Contains only whitespace changes.