Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

new coverage runner

goenning73be84cc46c1
diff --git a/.gitignore b/.gitignore
index 548833b92..195adf837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,6 @@ coverage.txt
profile.out
debug
debug.test
-.DS_Store
\ No newline at end of file
+.DS_Store
+.cover
+cover.out
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7e05d5fcf..7e026e1d7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -17,7 +17,9 @@
"dist": true,
"coverage.txt": true,
"debug": true,
- "**/debug.test": true
+ "**/debug.test": true,
+ ".cover": true,
+ "cover.out": true
},
"vsicons.presets.angular": true
}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 768b94b4a..b8afc858d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,13 @@ endif
test:
godotenv -f ${ENV_FILE} go test $$(go list ./... | grep -v /vendor/) -cover -p=1
-test-dbx:
- godotenv -f ${ENV_FILE} go test github.com/WeCanHearYou/wechy/app/pkg/dbx -cover -p=1
-
coverage:
+ godotenv -f ${ENV_FILE} ./cover.sh $$(go list ./... | grep -v /vendor/)
+
+old-coverage:
rm -rf coverage.txt
for d in $$(go list ./... | grep -v vendor); do \
- godotenv -f ${ENV_FILE} go test -p=1 -race -coverprofile=profile.out -covermode=atomic $$d ; \
+ godotenv -f ${ENV_FILE} go test -p=1 -race -coverprofile=profile.out -coverpkg=github.com/WeCanHearYou/wechy/app/... -covermode=atomic $$d ; \
if [ -f profile.out ]; then \
cat profile.out >> coverage.txt ; \
rm profile.out ; \
diff --git a/cover.sh b/cover.sh
new file mode 100755
index 000000000..4bff5137a
--- /dev/null
+++ b/cover.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+set -e
+
+COVER=.cover
+ROOT_PKG=github.com/WeCanHearYou/wechy/
+
+if [[ -d "$COVER" ]]; then
+ rm -rf "$COVER"
+fi
+mkdir -p "$COVER"
+
+# If a package directory has a .nocover file, don't count it when calculating
+# coverage.
+filter=""
+for pkg in "$@"; do
+ if [[ -f "$GOPATH/src/$pkg/.nocover" ]]; then
+ if [[ -n "$filter" ]]; then
+ filter="$filter, "
+ fi
+ filter="\"$pkg\": true"
+ fi
+done
+
+
+i=0
+for pkg in "$@"; do
+ i=$((i + 1))
+
+ extracoverpkg=""
+ if [[ -f "$GOPATH/src/$pkg/.extra-coverpkg" ]]; then
+ extracoverpkg=$( \
+ sed -e "s|^|$pkg/|g" < "$GOPATH/src/$pkg/.extra-coverpkg" \
+ | tr '\n' ',')
+ fi
+
+ coverpkg=$(go list -json "$pkg" | jq -r '
+ .Deps
+ | . + ["'"$pkg"'"]
+ | map
+ ( select(startswith("'"$ROOT_PKG"'"))
+ | select(contains("/vendor/") | not)
+ | select(in({'"$filter"'}) | not)
+ )
+ | join(",")
+ ')
+ testcoverpkg=$(go list -json "$pkg" | jq -r '
+ .XTestImports
+ | . + ["'"$pkg"'"]
+ | map
+ ( select(startswith("'"$ROOT_PKG"'"))
+ | select(contains("/vendor/") | not)
+ | select(in({'"$filter"'}) | not)
+ )
+ | join(",")
+ ')
+ if [[ -n "$extracoverpkg" ]]; then
+ coverpkg="$extracoverpkg$coverpkg"
+ fi
+
+ args=""
+ if [[ -n "$coverpkg" ]]; then
+ args="-p=1 -coverprofile $COVER/cover.${i}.out -covermode=count -coverpkg $coverpkg,$testcoverpkg"
+ fi
+
+ echo go test $args -v -race "$pkg"
+ go test $args -v -race "$pkg"
+done
+
+gocovmerge "$COVER"/*.out > cover.out
\ No newline at end of file
diff --git a/wercker.yml b/wercker.yml
index 49a0a4260..fb0eb0631 100644
--- a/wercker.yml
+++ b/wercker.yml
@@ -53,6 +53,7 @@ coverage:
name: get dotenv
code: |
go get github.com/joho/godotenv/cmd/godotenv
+ go get github.com/wadey/gocovmerge
# Publish to codecov.io
- script: