From e3bbfc40f6f27383f1361834662820aa17ae5b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Pab=C3=B3n?= <lpabon@redhat.com>
Date: Wed, 4 May 2016 08:52:38 -0400
Subject: [PATCH] Update .travis-coverage

---
 .travis-coverage | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/.travis-coverage b/.travis-coverage
index a2be919bff..871dac8f20 100755
--- a/.travis-coverage
+++ b/.travis-coverage
@@ -4,37 +4,13 @@
 # the tool requires that it be used only on one package when
 # capturing the coverage
 # This is why we need this little script here.
-packages="./apps/glusterfs"
-packages="${packages} ./executors/sshexec"
-packages="${packages} ./executors/mockexec"
-packages="${packages} ./executors ./apps"
-packages="${packages} ./client/cli/go/cmds"
-packages="${packages} ./client/api/go-client"
-packages="${packages} ./middleware"
 COVERFILE=packagecover.out
 
-coverage()
-{
+# For each package with test files, run with full coverage (including other packages)
+go list -f '{{if gt (len .TestGoFiles) 0}}"go test -covermode count -coverprofile {{.Name}}_{{len .Imports}}_{{len .Deps}}.coverprofile -coverpkg ./... {{.ImportPath}}"{{end}}' ./... | xargs -I {} bash -c {}
 
-    echo "mode: count" > $COVERFILE
-    for pkg in $packages ; do
-        echo "-- Testing $pkg --"
-
-        # Collect coverage
-        go test -covermode=count -coverprofile=cover.out $pkg || exit 1
-
-        # Show in the command line
-        go tool cover -func=cover.out
-
-        # Append to coverfile
-        grep -v "^mode: count" cover.out >> $COVERFILE
-
-        # Cleanup
-        rm -f cover.out
-    done
-}
-
-coverage
+# Merge the generated cover profiles into a single file
+gocovmerge `ls *.coverprofile` > $COVERFILE
 
 if [ -n "$COVERALLS_TOKEN" ] ; then
     # Send to coveralls.io