summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-03-30 13:56:23 -0600
committerMartin Roth <martinroth@google.com>2016-04-13 02:11:28 +0200
commite03305358ffa30dbb89adbd0c6c26710c2a1be20 (patch)
tree85e061482f42280e1ce591da77d7b07f9d5e5945
parent6c1e81059dc928df6546289073ae61939b52b196 (diff)
downloadcoreboot-e03305358ffa30dbb89adbd0c6c26710c2a1be20.tar.xz
lint/lint-stable-004-style-labels: Update script
- Look at entire tree instead of just the current commit. This was causing the test to overlook some issues that were already in the tree. - If git is on the system, and the code is in a git repo, use the 'git ls-files' command to find the files to examine. If those conditions aren't met, fall back to using the find command. - Wrap the command so it's easier to read. Change-Id: I3dce219a29ffb1ae56a31318b995e3ba8ea43e70 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/14194 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rwxr-xr-xutil/lint/lint-stable-004-style-labels14
1 files changed, 13 insertions, 1 deletions
diff --git a/util/lint/lint-stable-004-style-labels b/util/lint/lint-stable-004-style-labels
index f024ca1bd3..7b68b4ad63 100755
--- a/util/lint/lint-stable-004-style-labels
+++ b/util/lint/lint-stable-004-style-labels
@@ -2,6 +2,7 @@
# This file is part of the coreboot project.
#
# Copyright (C) 2012 Patrick Georgi <patrick@georgi-clan.de>
+# Copyright (C) 2016 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,4 +16,15 @@
# DESCR: Check that C labels begin at start-of-line
LC_ALL=C export LC_ALL
-git diff --name-status |grep -v "^D" |cut -c3- |grep "^src/.*\.[csS]" | xargs grep -Hn '^[[:space:]][[:space:]]*[a-z][a-z]*:[[:space:]]*$' |grep -v "[^a-z_]default:"
+
+# Use git ls-files if the code is in a git repo, otherwise use find.
+if [ -n "$(command -v git)" ] && [ -d .git ]; then
+ FIND_FILES="git ls-files"
+else
+ FIND_FILES="find src"
+fi
+
+${FIND_FILES} | \
+ grep "^src/.*\.[csS]$" | \
+ xargs grep -Hn '^[[:space:]][[:space:]]*[a-z][a-z]*:[[:space:]]*$' | \
+ grep -v "[^a-z_]default:"