From cf53dc1f19564fc3fe5fb6cf81b5eaf0282bcb77 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Thu, 14 Jul 2016 16:42:23 +0100 Subject: [PATCH 1/3] Exclude vendor from shell linting --- files-with-type | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files-with-type b/files-with-type index d969f4405..0c7dcbb09 100755 --- a/files-with-type +++ b/files-with-type @@ -10,4 +10,4 @@ mime_type=$1 shift -find "$@" -print0 -type f |xargs -0 file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//' +git ls-files | grep -vE '^vendor/' | xargs file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//' From 8b7ec6ebbca8d9ae751cdd79b2554087a1a1c5d4 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Thu, 14 Jul 2016 16:42:38 +0100 Subject: [PATCH 2/3] Speed up test by using git ls-files --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 61791772b..55da67e3e 100755 --- a/test +++ b/test @@ -47,7 +47,7 @@ fi fail=0 -TESTDIRS=( $(find . -type f -name '*_test.go' -print0 | xargs -0 -n1 dirname | grep -vE '^\./(\.git|vendor|prog|experimental)/' | sort -u) ) +TESTDIRS=( $(git ls-files -- '*_test.go' | grep -vE '^(vendor|prog|experimental)/' | xargs -n1 dirname | sort -u) ) # If running on circle, use the scheduler to work out what tests to run on what shard if [ -n "$CIRCLECI" ] && [ -z "$NO_SCHEDULER" ] && [ -x "$DIR/sched" ]; then From 87864270eee441f25ef6d25ebe36652ddc5b4396 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Thu, 14 Jul 2016 16:42:51 +0100 Subject: [PATCH 3/3] Remove spurious debugging code from test --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index 55da67e3e..a59c922e2 100755 --- a/test +++ b/test @@ -1,6 +1,6 @@ #!/bin/bash -set -ex +set -e DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" GO_TEST_ARGS=( -tags netgo -cpu 4 -timeout 8m )