From eabb40f0aef515c8beb686803bd020ccef8676ea Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Tue, 10 Apr 2018 16:43:01 -0700 Subject: [PATCH] test: combine "compile_pass" into "build_pass" Signed-off-by: Gyuho Lee --- Makefile | 4 ++-- test | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 71ff1ee18..3eb4678c2 100644 --- a/Makefile +++ b/Makefile @@ -118,7 +118,7 @@ compile-setup-gopath-with-docker-test: # # Local machine: # TEST_OPTS="PASSES='fmt'" make test -# TEST_OPTS="PASSES='fmt bom dep compile build unit'" make test +# TEST_OPTS="PASSES='fmt bom dep build unit'" make test # TEST_OPTS="PASSES='build unit release integration_e2e functional'" make test # TEST_OPTS="PASSES='build grpcproxy'" make test # @@ -128,7 +128,7 @@ compile-setup-gopath-with-docker-test: # TEST_OPTS="VERBOSE=2 PASSES='unit'" make docker-test # # Travis CI (test with docker): -# TEST_OPTS="PASSES='fmt bom dep compile build unit'" make docker-test +# TEST_OPTS="PASSES='fmt bom dep build unit'" make docker-test # # Semaphore CI (test with docker): # TEST_OPTS="PASSES='build unit release integration_e2e functional'" make docker-test diff --git a/test b/test index cc94244ac..ee66cd118 100755 --- a/test +++ b/test @@ -41,7 +41,7 @@ if [[ "${PASSES}" == *"functional"* ]]; then fi if [ -z "$PASSES" ]; then - PASSES="fmt bom dep compile build unit" + PASSES="fmt bom dep build unit" fi USERPKG=${PKG:-} @@ -619,14 +619,11 @@ function build_cov_pass { go test -tags cov -c -covermode=set -coverpkg="$PKGS_COMMA" -o "${out}/etcdctl_test" "${REPO_PATH}/etcdctl" } -function compile_pass { - echo "Checking build..." - GO_BUILD_FLAGS="-a -v" tools_build -} - # fail fast on static tests function build_pass { + echo "Checking build..." GO_BUILD_FLAGS="-a -v" etcd_build + GO_BUILD_FLAGS="-a -v" tools_build } for pass in $PASSES; do