Merge remote-tracking branch 'upstream/develop' into evmjit

1 files changed, 9 insertions, 7 deletions

diff --git a/gocoverage.sh b/gocoverage.sh
index 4245e3901..5479d8d3b 100755
--- a/gocoverage.sh
+++ b/gocoverage.sh
@@ -1,11 +1,16 @@
 #!/bin/bash
-# The script does automatic checking on a Go package and its sub-packages, including:
-# 6. test coverage (http://blog.golang.org/cover)
 
 set -e
 
-# Run test coverage on each subdirectories and merge the coverage profile.
+# Add godep workspace to GOPATH. We do it manually instead of using
+# 'godep go test' or 'godep restore' so godep doesn't need to be installed.
+GOPATH="$PWD/Godeps/_workspace:$GOPATH"
+
+# Install packages before testing. Not doing this would cause
+# 'go test' to recompile all package dependencies before testing each package.
+go install ./...
 
+# Run test coverage on each subdirectories and merge the coverage profile.
 echo "mode: count" > profile.cov
 
 # Standard go tooling behavior is to ignore dirs with leading underscors
@@ -13,7 +18,7 @@ for dir in $(find . -maxdepth 10 -not -path './.git*' -not -path '*/_*' -type d)
 do
 if ls $dir/*.go &> /dev/null; then
     # echo $dir
-    if [[ $dir != "./tests/vm" ]]
+    if [[ $dir != "./tests/vm" && $dir != "." ]]
     then
         go test -covermode=count -coverprofile=$dir/profile.tmp $dir
     fi
@@ -24,6 +29,3 @@ if ls $dir/*.go &> /dev/null; then
     fi
 fi
 done
-
-go tool cover -func profile.cov
-