From a60111565097d1338192a635ba975753d54099a3 Mon Sep 17 00:00:00 2001 From: James Shubin Date: Mon, 20 Feb 2017 18:12:01 -0500 Subject: [PATCH] test: Fix false negative on go vet This was my fault, now it is fixed :) It passed locally due to a bug. --- test/test-govet.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test-govet.sh b/test/test-govet.sh index c87d6ba4..58f6b798 100755 --- a/test/test-govet.sh +++ b/test/test-govet.sh @@ -15,11 +15,17 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )" # dir! cd "${ROOT}" function simplify-gocase() { - grep 'case _ = <-' "$1" && fail_test 'case _ = <- can be simplified to: case <-' # this can be simplified + if grep 'case _ = <-' "$1"; then + return 1 # 'case _ = <- can be simplified to: case <-' + fi + return 0 } function token-coloncheck() { - grep -Ei "[\/]+[\/]+[ ]*+(FIXME[^:]|TODO[^:]|XXX[^:])" "$1" && fail_test 'Token is missing a colon' # tokens must end with a colon + if grep -Ei "[\/]+[\/]+[ ]*+(FIXME[^:]|TODO[^:]|XXX[^:])" "$1"; then + return 1 # tokens must end with a colon + fi + return 0 } for file in `find . -maxdepth 3 -type f -name '*.go' -not -path './old/*' -not -path './tmp/*'`; do