From 5b63edbdbc91c8cd3f1d310b941a1a40850bde80 Mon Sep 17 00:00:00 2001 From: V2Ray Date: Sat, 19 Sep 2015 18:55:43 +0200 Subject: [PATCH] Update coverall script to get better coverage info --- testing/coverage/coverall | 40 ++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/testing/coverage/coverall b/testing/coverage/coverall index 7ef487f72..1b35bfd5a 100755 --- a/testing/coverage/coverall +++ b/testing/coverage/coverall @@ -1,25 +1,35 @@ #!/bin/bash -echo "mode: set" > coverall.out -fail=0 +FAIL=0 -for dir in $(find . -maxdepth 10 -not -path './.git*' -type d); -do - if ls $dir/*.go &> /dev/null; then - go test -coverprofile=coversingle.out $dir || fail=1 - if [ -f coversingle.out ] - then - cat coversingle.out | grep -v "mode: set" >> coverall.out - rm coversingle.out - fi +function join { local IFS="$1"; shift; echo "$*"; } + +function test_package { + DIR="github.com/v2ray/v2ray-core/$1" + DEP=$2 + IFS=',' read -ra DEPS <<< "$DEP" + DEPS=("${DEPS[@]/#/github.com/v2ray/v2ray-core/}") + DEP=$(join , "${DEPS[@]}") + go test -coverprofile=coversingle.out -coverpkg=$DEP $DIR || FAIL=1 + if [ -f coversingle.out ]; then + cat coversingle.out | grep -v "mode: set" >> coverall.out + rm coversingle.out fi -done +} -if [ "$fail" -eq 0 ] -then +echo "mode: set" > coverall.out + +test_package "." "." +test_package "io/socks" "io,io/socks" +test_package "io/vmess" "hash,io,io/vmess" +test_package "math" "math" +test_package "net/socks" "io,io/socks,net,net/socks" +test_package "net" "net" + +if [ "$FAIL" -eq 0 ]; then $HOME/gopath/bin/goveralls -v -coverprofile=coverall.out -service=travis-ci -repotoken $COVERALLS_TOKEN fi rm -f coverall.out -exit $fail \ No newline at end of file +exit $FAIL