diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh index 4886ee58..aa0d508e 100755 --- a/scripts/travis-build.sh +++ b/scripts/travis-build.sh @@ -35,13 +35,13 @@ finish_test() # Check for whitespace errors ###################################################################### -start_test check_whitespace "Check whitespace" 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 finish_test check_whitespace "Check whitespace" @@ -54,15 +54,15 @@ DICTDIR=${BUILD_DIR}/dict mkdir -p ${DICTDIR} for TARGET in test/configs/*.config ; do - start_test mcu_compile "$TARGET" make clean make distclean unset CC + start_test mcu_compile "$TARGET" cp ${TARGET} .config make olddefconfig make V=1 - cp out/klipper.dict ${DICTDIR}/$(basename ${TARGET} .config).dict finish_test mcu_compile "$TARGET" + cp out/klipper.dict ${DICTDIR}/$(basename ${TARGET} .config).dict done