From 31e0d42a1de4605b5c5e89310643a5e8bbee4be5 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 10 Jun 2018 11:07:16 -0600 Subject: [PATCH] util/lint: Run lint-extended-007-final-newlines checks in parallel Instead of checking each directory in series, kick off the checks in parallel and then wait for them to finish. Failures print out with file information, so mixing output isn't a problem. This reduces the time it takes to run on lumberingbuilder by 60%. This could probably be sped up even more by splitting up src/mainboard into smaller sections. This method does skip a few control files at the top level - .gitignore, .checkpatch.conf, gnat.adc, etc. These could be added to the list of files to check, but I didn't think it was needed. Change-Id: I171977e713a9956cf4142cfc0a199e10040abb35 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/27011 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- util/lint/lint-extended-015-final-newlines | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/util/lint/lint-extended-015-final-newlines b/util/lint/lint-extended-015-final-newlines index 4ddd00bf74..b5a503f3cf 100755 --- a/util/lint/lint-extended-015-final-newlines +++ b/util/lint/lint-extended-015-final-newlines @@ -16,6 +16,8 @@ LC_ALL=C export LC_ALL +PIDS="" +INCLUDED_DIRS_AND_FILES='util/* src/* payloads/* configs/* Makefile *.inc' EXCLUDED_DIRS='src/vendorcode/\|util/romcc/\|cbfstool/lzma/\|cbfstool/lz4/\|Documentation/\|build/\|3rdparty/\|\.git/\|coreboot-builds/\|util/nvidia/cbootimage/' EXCLUDED_FILES='\.jpg$\|\.cksum$\|\.bin$\|\.vbt$\|\.hex$\|\.ico$\|\.o$\|\.bz2$\|\.xz$\|^.tmpconfig\|\.pyc$\|_shipped$\|sha256$\|\.png$\|\.patch$' @@ -25,7 +27,7 @@ if [ -n "$(command -v git)" ] && \ then FIND_FILES="git ls-files" else - FIND_FILES="find . " + FIND_FILES="find" fi HAVE_FILE=$(command -v file 1>/dev/null 2>&1; echo $?) @@ -49,7 +51,6 @@ test_for_final_newline() { if [ -f "$filename" ] && { [ ! -x "$filename" ] || \ is_eligible_executable "$filename"; }; then - # Verify that there is a newline at the end # $() strips trailing newlines if [ -n "$(tail -c 1 "$filename")" ]; then @@ -65,7 +66,15 @@ test_for_final_newline() { done } -${FIND_FILES} | sed 's|^\./||' | sort | \ - grep -v "$EXCLUDED_DIRS" | \ - grep -v "$EXCLUDED_FILES" | \ - test_for_final_newline +for directory in $INCLUDED_DIRS_AND_FILES ; do + ${FIND_FILES} ${directory} | sed 's|^\./||' | sort | \ + grep -v "$EXCLUDED_DIRS" | \ + grep -v "$EXCLUDED_FILES" | \ + test_for_final_newline & + PIDS="$PIDS $!" +done + +# wait for tests to finish. +for pid in $PIDS; do + wait "$pid" +done