diff options
| author | Martin Roth <martinroth@google.com> | 2016-08-30 09:39:48 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-08-14 18:05:41 +0000 |
| commit | ea383676cf7e36b48d9d548d286297271f463cab (patch) | |
| tree | 94b48bb5ae9f70f4faea0598d8563be998d4ec9f | |
| parent | 35bfb9d9be3dcb6c8605a7dbe02da13a349aa995 (diff) | |
Makefile.inc: lint: Update to run lint-extended scripts
- Add lint-extended as a valid option
- Call lint-extend from what-jenkins-does and test-lint
- When logging to a junit.xml file, name the file extended-junit.xml
so it doesn't conflict with the stable junit.xml file.
Change-Id: I7e4156844b8c60790e03a0e43564610bb0c8f386
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/16362
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Chris Ching <chingcodes@chromium.org>
| -rwxr-xr-x | util/lint/lint | 9 | ||||
| -rw-r--r-- | util/testing/Makefile.inc | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/util/lint/lint b/util/lint/lint index 772d8bdaeb..0cbe0109e0 100755 --- a/util/lint/lint +++ b/util/lint/lint @@ -14,7 +14,7 @@ #set -x # uncomment for debug usage () { - printf "Usage: %s <lint|lint-stable> [--junit]\n" "$0" + printf "Usage: %s <lint|lint-stable|lint-extended> [--junit]\n" "$0" } #write to the junit xml file if --junit was specified @@ -25,17 +25,20 @@ junit_write () { } #verify the first command line parameter -if [ -z "$1" ] || [ "$1" != "lint" ] && [ "$1" != "lint-stable" ]; then +if [ -z "$1" ] || [ "$1" != "lint" ] && [ "$1" != "lint-stable" ] && \ + [ "$1" != "lint-extended" ]; then usage exit 1 fi LINTLOG=$(mktemp .tmpconfig.lintXXXXX); XMLFILE="$(dirname "$0")/junit.xml" +if [ "$1" = "lint-extended" ]; then + XMLFILE="$(dirname "$0")/extended-junit.xml" +fi FAILED=0; #check optional second command line parameter. -#TODO: Add real command line handling if anything more is added if [ "$2" = "--junit" ]; then JUNIT=1 echo '<?xml version="1.0" encoding="utf-8"?>' > "$XMLFILE" diff --git a/util/testing/Makefile.inc b/util/testing/Makefile.inc index 160210b3e7..977bc9fcc0 100644 --- a/util/testing/Makefile.inc +++ b/util/testing/Makefile.inc @@ -67,11 +67,12 @@ JENKINS_PAYLOAD?=none TEST_PAYLOAD?=$(JENKINS_PAYLOAD) CPUS?=4 -lint lint-stable: +lint lint-stable lint-extended: util/lint/lint $@ what-jenkins-does: util/lint/lint lint-stable --junit + util/lint/lint lint-extended --junit util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) -x -X $(top)/abuild-chromeos.xml util/abuild/abuild -B -J $(if $(JENKINS_NOCCACHE),,-y) -c $(CPUS) -z -p $(JENKINS_PAYLOAD) (cd payloads/libpayload; unset COREBOOT_BUILD_DIR; $(MAKE) $(if $(JENKINS_NOCCACHE),,CONFIG_LP_CCACHE=y) V=$(V) Q=$(Q) junit.xml) @@ -84,7 +85,7 @@ test-basic: test-lint test-tools test-abuild test-payloads test-cleanup test-lint: util/lint/lint lint-stable - util/lint/lint-015-final-newlines + util/lint/lint lint-extended test-abuild: rm -rf coreboot-builds-chromeos coreboot-builds |