From bd9865f217eb7484f3fcba71027e2a10d38d1a11 Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Wed, 10 Jun 2015 15:52:47 +0000 Subject: [PATCH] Introduce ./bin/test -slow, run by circle. Allow developers to run faster tests. --- bin/test | 13 +++++++++++-- circle.yml | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bin/test b/bin/test index 95e23a421..a92ea1409 100755 --- a/bin/test +++ b/bin/test @@ -1,16 +1,25 @@ #!/bin/sh +set -eu + +GO_TEST_ARGS="-covermode=count" +RUN_ERRCHECK="" +if [ $# -eq 1 ] && [ "$1" = "-slow" ]; then + GO_TEST_ARGS="-race -covermode=atomic" + RUN_ERRCHECK="yes" +fi + echo "mode: count" > profile.cov fail=0 for dir in $(find . -type f -name '*_test.go' | grep -v '^./experimental/' | grep -v '^./releases/' | xargs -n1 dirname | sort -u); do go get -t $dir - if ! errcheck -ignore 'Close' $dir ; then + if [ "$RUN_ERRCHECK" = "yes" ] && ! errcheck -ignore 'Close' $dir ; then fail=1 fi output=$(mktemp cover.XXXXXXXXXX) - if ! go test -race -tags netgo -covermode=atomic -coverprofile=$output $dir ; then + if ! go test $GO_TEST_ARGS -timeout 10s -tags netgo -coverprofile=$output $dir ; then fail=1 fi diff --git a/circle.yml b/circle.yml index 35744c76c..4e74f2b76 100644 --- a/circle.yml +++ b/circle.yml @@ -36,7 +36,7 @@ test: - cd $SRCDIR; ./bin/lint . - cd $SRCDIR; make static - cd $SRCDIR; make - - cd $SRCDIR; ./bin/test + - cd $SRCDIR; ./bin/test -slow - cd $SRCDIR; make client-test - cd $SRCDIR/experimental; make post: