Martin Roth has uploaded this change for review. ( https://review.coreboot.org/28448
Change subject: util/lint: Update non-ascii linter for FreeBSD ......................................................................
util/lint: Update non-ascii linter for FreeBSD
On FreeBSD, this test was failing with the error: "grep: Argument list too long"
- Remove support for testing coreboot not in a git repo. Many of the other linters already don't support this. - Use git grep to find offending files, then xargs to print out the lines.
Change-Id: Ic017dc3465fd9a46ff4e6ec5ef16396e963483cd Signed-off-by: Martin Roth martinr@coreboot.org --- M util/lint/lint-stable-016-non-ascii 1 file changed, 13 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/28448/1
diff --git a/util/lint/lint-stable-016-non-ascii b/util/lint/lint-stable-016-non-ascii index beffd83..3c22900 100755 --- a/util/lint/lint-stable-016-non-ascii +++ b/util/lint/lint-stable-016-non-ascii @@ -21,13 +21,11 @@ EXCLUDED_FILES='to-wiki/towiki.sh$|vga/vga_font|video/font|PDCurses.*x11' EXCLUDED_PHRASES='Copyright|Ported to|Intel®|°C|°F|Athlon™|Copyright.*©|A-Za-zÀ-ÿ'
-# Use git ls-files if the code is in a git repo, otherwise use find. -if [ -n "$(command -v git)" ] && \ - [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] +# Exit if git isn't present or the code isn't in a git repo +if [ -z "$(command -v git)" ] || \ + [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" != "true" ] then - FIND_FILES="git ls-files" -else - FIND_FILES="find . " + exit fi
# 1. Get the list of files to parse and send them through grep @@ -36,10 +34,12 @@ # 3. Remove common phrases and names that have been found # 4. Run the result through grep again to highlight the issues that were # found. Without this step, the characters can be difficult to see. -grep -n "[^ -~]" \ - $(${FIND_FILES} | sed 's|^./||' | sort | \ - grep "$INCLUDED_FILES" | \ - grep -v "$EXCLUDED_DIRS" | \ - grep -v "$EXCLUDED_FILES") | \ - grep -iv "$EXCLUDED_PHRASES" | \ - grep --color='auto' "[^ -~]" +# shellcheck disable=SC2046 +git grep -lP "[^\t-~]" | \ + grep "$INCLUDED_FILES" | \ + grep -v "$EXCLUDED_DIRS" | \ + grep -v "$EXCLUDED_FILES" | \ + xargs -I % \ + grep -n "[^ -~]" % | \ + grep -iv "$EXCLUDED_PHRASES" | \ + grep --color='auto' "[^ -~]"