1. Fixed codecoverage

Author: iasergunin

.gitignore

@@ -28,3 +28,4 @@ vendor/
 
 # Code coverage
 coverage.*
+coverage/

Makefile

@@ -1,21 +1,21 @@
-GO_TEST=cd ./sh && sh ./go.test.sh
-GO_TEST_WITH_REAL_DB=$(GO_TEST) --tags=with_real_db
-
 DIR=$(PWD)
-COVERAGE_FILE=`echo $(DIR)/coverage.out`
+
+GO_TEST=cd ./sh && bash ./go.test.sh
+GO_TEST_COVERAGE=cd ./sh && bash ./go.test.coverage.sh
+
+GO_TEST_WITH_REAL_DB=--tags=with_real_db
 
 test:
 	$(GO_TEST)
 
 test.with_real_db:
-	$(GO_TEST_WITH_REAL_DB)
+	$(GO_TEST) $(GO_TEST_WITH_REAL_DB)
 
-# TODO see in https://gist.github.com/skarllot/13ebe8220822bc19494c8b076aabe9fc
 test.coverage:
-	$(GO_TEST) -covermode=atomic -coverprofile=$(COVERAGE_FILE)
+	$(GO_TEST_COVERAGE)
 
 test.coverage.with_real_db:
-	$(GO_TEST_WITH_REAL_DB) -covermode=atomic -coverprofile=$(COVERAGE_FILE)
+	$(GO_TEST_COVERAGE) $(GO_TEST_WITH_REAL_DB)
 
 fmt:
 	go fmt ./...

internal/cover/nested/cover.build.sh

@@ -0,0 +1,21 @@
+cd ./module1/cmd
+
+mkdir -p codecov
+
+go build -cover -o run.exe .
+GOCOVERDIR=./codecov ./run.exe
+
+# go test ./... -covermode=atomic -coverprofile=coverage.out
+
+cd ../../module2/cmd
+
+mkdir -p codecov
+
+go build -cover -o run.exe .
+GOCOVERDIR=./codecov ./run.exe
+
+# go test ./... -covermode=atomic -coverprofile=coverage.out
+
+cd ../../
+
+go tool covdata textfmt -i=module1/cmd/codecov,module2/cmd/codecov -o ./output.out

sh/go.mod.tidy.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 cd ../
 
 ROOT=$(pwd)

sh/go.mod.vendor.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 cd ../
 
 ROOT=$(pwd)

sh/go.test.coverage.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+DIR=$(pwd)
+ROOT="$(pwd)/.."
+
+COVERAGE_TEST="-cover -covermode=atomic -test.gocoverdir=$ROOT/coverage"
+
+drivers=("$($DIR/utils/drivers.sh)")
+
+mkdir -p $ROOT/coverage
+
+./go.test.sh $COVERAGE_TEST "$@"
+
+drivers_i="${drivers// //coverage,}"
+go tool covdata textfmt -i="$ROOT/coverage" -o "$ROOT/coverage.out"

sh/go.test.sh

@@ -1,3 +1,9 @@
+#!/bin/bash
+
+DIR=$(pwd)
+
+drivers=("$($DIR/utils/drivers.sh)")
+
 cd ../
 
 ROOT=$(pwd)
@@ -9,16 +15,16 @@ golist() {
 gotest() {
   cd $driver
 
-  go test $(golist) -race "$@"
+  go test $(golist) "$@"
 
   cd $ROOT
 }
 
-go test $(golist) -race "$@"
+go test $(golist) $@ &
 
-for driver in ./drivers/*; do
+for driver in $drivers; do
   if [ -d "$driver" ]; then
-    gotest "$@" &
+    gotest $@ &
   fi
 done
 

sh/utils/drivers.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd ../
+
+echo drivers/*