From b7f8a9c7c4af41b25104ee08640fa9d6f37f648e Mon Sep 17 00:00:00 2001 From: Zhiwei Yin Date: Mon, 9 Dec 2024 11:12:03 +0800 Subject: [PATCH] fix gocovmerge cannot work using old go version Signed-off-by: Zhiwei Yin --- build/run-unit-tests.sh | 2 +- build/test-package.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/run-unit-tests.sh b/build/run-unit-tests.sh index 593204ee..9756c14b 100755 --- a/build/run-unit-tests.sh +++ b/build/run-unit-tests.sh @@ -11,7 +11,7 @@ _script_dir=$(dirname "$0") -if ! which gocovmerge > /dev/null; then echo "Installing gocovmerge..."; pushd $(mktemp -d) && GOSUMDB=off go install github.com/wadey/gocovmerge@latest && popd; fi +#if ! which gocovmerge > /dev/null; then echo "Installing gocovmerge..."; pushd $(mktemp -d) && GOSUMDB=off go install github.com/wadey/gocovmerge@latest && popd; fi if ! which patter > /dev/null; then echo "Installing patter ..."; pushd $(mktemp -d) && GOSUMDB=off go install github.com/apg/patter@latest && popd; fi export GOFLAGS="" diff --git a/build/test-package.sh b/build/test-package.sh index 17543e00..abd3140e 100755 --- a/build/test-package.sh +++ b/build/test-package.sh @@ -33,10 +33,10 @@ mkdir -p $_tap_out_dir go test -v -cover -coverpkg=$_cover_pkgs -covermode=atomic -coverprofile=test/unit/coverage/cover.tmp $_package 2> >( grep -v "warning: no packages being tested depend on" >&2 ) | $GOPATH/bin/patter | tee $_tap_out_dir/$_tap_name.tap | grep -v "TAP version 13" | grep -v ": PASS:" | grep -v -i "# /us" # Merge coverage files -if [ -f test/unit/coverage/cover.tmp ]; then - $GOPATH/bin/gocovmerge test/unit/coverage/cover.tmp test/unit/coverage/cover.out > test/unit/coverage/cover.all - mv test/unit/coverage/cover.all test/unit/coverage/cover.out -fi +#if [ -f test/unit/coverage/cover.tmp ]; then +# $GOPATH/bin/gocovmerge test/unit/coverage/cover.tmp test/unit/coverage/cover.out > test/unit/coverage/cover.all +# mv test/unit/coverage/cover.all test/unit/coverage/cover.out +#fi # Clean up temporary files rm -f test/unit/coverage/cover.tmp