From 4bb0b6defdf9f78507ba5646b64c4876f5b429d0 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 23 Jun 2019 17:44:48 -0400 Subject: [PATCH] check_whitespace: Add script to run whitespace checks Allow users to run the "travis ci" whitespace check directly from the command-line. Signed-off-by: Kevin O'Connor --- scripts/check_whitespace.sh | 15 +++++++++++++++ scripts/travis-build.sh | 8 +------- 2 files changed, 16 insertions(+), 7 deletions(-) create mode 100755 scripts/check_whitespace.sh diff --git a/scripts/check_whitespace.sh b/scripts/check_whitespace.sh new file mode 100755 index 00000000..bd136d86 --- /dev/null +++ b/scripts/check_whitespace.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# Script to check whitespace in Klipper source code. + +# Find SRCDIR from the pathname of this script +SRCDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )" +cd ${SRCDIR} + +# Run whitespace tool on all source files +WS_DIRS="config/ docs/ klippy/ scripts/ src/ test/" +WS_EXCLUDE="-path scripts/kconfig -prune" +WS_FILES="-o -iname '*.[csh]' -o -name '*.py' -o -name '*.sh'" +WS_FILES="$WS_FILES -o -name '*.md' -o -name '*.cfg'" +WS_FILES="$WS_FILES -o -name '*.test' -o -name '*.config'" +WS_FILES="$WS_FILES -o -iname '*.lds' -o -iname 'Makefile' -o -iname 'Kconfig'" +eval find $WS_DIRS $WS_EXCLUDE $WS_FILES | xargs ./scripts/check_whitespace.py diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 1f82b3f2..2cd96631 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -35,14 +35,8 @@ finish_test() # Check for whitespace errors ###################################################################### -WS_DIRS="config/ docs/ klippy/ scripts/ src/ test/" -WS_EXCLUDE="-path scripts/kconfig -prune" -WS_FILES="-o -iname '*.[csh]' -o -name '*.py' -o -name '*.sh'" -WS_FILES="$WS_FILES -o -name '*.md' -o -name '*.cfg'" -WS_FILES="$WS_FILES -o -name '*.test' -o -name '*.config'" -WS_FILES="$WS_FILES -o -iname '*.lds' -o -iname 'Makefile' -o -iname 'Kconfig'" start_test check_whitespace "Check whitespace" -eval find $WS_DIRS $WS_EXCLUDE $WS_FILES | xargs ./scripts/check_whitespace.py +./scripts/check_whitespace.sh finish_test check_whitespace "Check whitespace"