From d00df557c758876dfacf30729043fad2dc10fb70 Mon Sep 17 00:00:00 2001
From: Igor Sirotin <sirotin@status.im>
Date: Wed, 19 Jun 2024 17:57:44 +0100
Subject: [PATCH] fix_: final coverage reports merging (#5384)

---
 _assets/scripts/run_unit_tests.sh     | 6 ++++--
 _assets/scripts/test-with-coverage.sh | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/_assets/scripts/run_unit_tests.sh b/_assets/scripts/run_unit_tests.sh
index 98f8f13f0..b08e5f23c 100755
--- a/_assets/scripts/run_unit_tests.sh
+++ b/_assets/scripts/run_unit_tests.sh
@@ -114,6 +114,8 @@ fi
 
 echo -e "${GRN}Testing HEAD:${RST} $(git rev-parse HEAD)"
 
+rm -rf ./**/*.coverage.out
+
 for package in ${UNIT_TEST_PACKAGES}; do
   for ((i=1; i<=UNIT_TEST_COUNT; i++)); do
     if ! is_parallelizable "${package}" || [[ "$UNIT_TEST_FAILFAST" == 'true' ]]; then
@@ -132,9 +134,9 @@ for package in ${UNIT_TEST_PACKAGES}; do
 done
 
 # Gather test coverage results
+rm -f c.out
 echo "mode: atomic" > c.out
-grep -h -v "^mode:" ./**/*.coverage.out >> c.out
-rm -rf ./**/*.coverage.out
+grep -r -h -v "^mode:" --include "*.coverage.out" >> c.out
 
 if [[ $UNIT_TEST_REPORT_CODECLIMATE == 'true' ]]; then
   # https://docs.codeclimate.com/docs/jenkins#jenkins-ci-builds
diff --git a/_assets/scripts/test-with-coverage.sh b/_assets/scripts/test-with-coverage.sh
index fb2229bbf..d1f3b8519 100755
--- a/_assets/scripts/test-with-coverage.sh
+++ b/_assets/scripts/test-with-coverage.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eu
-coverage_file_path="${PACKAGE_DIR}/$(mktemp coverage.out.rerun.XXXXXXXXXX)"
+coverage_file_path="$(mktemp coverage.out.rerun.XXXXXXXXXX --tmpdir="${PACKAGE_DIR}")"
 go test -json \
   -covermode=atomic \
   -coverprofile="${coverage_file_path}" \