From 0bd94bbae54af596172cb664c4d73192b726d768 Mon Sep 17 00:00:00 2001 From: James Blair Date: Thu, 30 Mar 2023 16:30:11 +1300 Subject: [PATCH] Remove defunct build_cov target. Signed-off-by: James Blair --- scripts/codecov_upload.sh | 2 +- scripts/test.sh | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/codecov_upload.sh b/scripts/codecov_upload.sh index 8ee1a65af..b516b3bf1 100755 --- a/scripts/codecov_upload.sh +++ b/scripts/codecov_upload.sh @@ -8,7 +8,7 @@ set -o pipefail LOG_FILE=${1:-test-coverage.log} # We collect the coverage -COVERDIR=covdir PASSES='build build_cov cov' ./scripts/test.sh 2>&1 | tee "${LOG_FILE}" +COVERDIR=covdir PASSES='build cov' ./scripts/test.sh 2>&1 | tee "${LOG_FILE}" test_success="$?" # We try to upload whatever we have: diff --git a/scripts/test.sh b/scripts/test.sh index dfccc9e73..642b4996b 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -29,7 +29,7 @@ # # Run code coverage # COVERDIR must either be a absolute path or a relative path to the etcd root -# $ COVERDIR=coverage PASSES="build build_cov cov" ./scripts/test.sh +# $ COVERDIR=coverage PASSES="build cov" ./scripts/test.sh # $ go tool cover -html ./coverage/cover.out set -e @@ -168,13 +168,6 @@ function grpcproxy_e2e_pass { ################# COVERAGE ##################################################### -# Builds artifacts used by tests/e2e in coverage mode. -function build_cov_pass { - run_for_module "server" run go test -tags cov -c -covermode=set -coverpkg="./..." -o "../bin/etcd_test" - run_for_module "etcdctl" run go test -tags cov -c -covermode=set -coverpkg="./..." -o "../bin/etcdctl_test" - run_for_module "etcdutl" run go test -tags cov -c -covermode=set -coverpkg="./..." -o "../bin/etcdutl_test" -} - # pkg_to_coverflag [prefix] [pkgs] # produces name of .coverprofile file to be used for tests of this package function pkg_to_coverprofileflag { @@ -261,11 +254,6 @@ function cov_pass { return 255 fi - if [ ! -f "bin/etcd_test" ]; then - log_error "etcd_test binary not found. Call: PASSES='build_cov' ./scripts/test.sh" - return 255 - fi - local coverdir coverdir=$(readlink -f "${COVERDIR}") mkdir -p "${coverdir}"