From cd689ce2c17397310c4e90b87ca8468e363ca449 Mon Sep 17 00:00:00 2001 From: rigelrozanski Date: Mon, 7 May 2018 18:44:03 -0400 Subject: [PATCH] remove experimental bash tests from ci int Fix typo ... --- .circleci/config.yml | 21 +-------------------- Makefile | 2 +- tests/test_cover.sh | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 122827afd6..2accbf1790 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,22 +84,6 @@ jobs: export PATH="$GOBIN:$PATH" make test_unit - test_cli: - <<: *defaults - parallelism: 1 - steps: - - attach_workspace: - at: /tmp/workspace - - restore_cache: - key: v1-pkg-cache - - restore_cache: - key: v1-tree-{{ .Environment.CIRCLE_SHA1 }} - - run: - name: Test cli - command: | - export PATH="$GOBIN:$PATH" - make test_cli - test_cover: <<: *defaults parallelism: 4 @@ -115,7 +99,7 @@ jobs: command: | export PATH="$GOBIN:$PATH" make install - for pkg in $(go list github.com/cosmos/cosmos-sdk/... | grep -v /vendor/ | circleci tests split --split-by=timings); do + for pkg in $(go list github.com/cosmos/cosmos-sdk/... | grep -v /vendor/ | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test | circleci tests split --split-by=timings); do id=$(basename "$pkg") go test -timeout 5m -race -coverprofile=/tmp/workspace/profiles/$id.out -covermode=atomic "$pkg" @@ -156,9 +140,6 @@ workflows: - test_unit: requires: - setup_dependencies - - test_cli: - requires: - - setup_dependencies - test_cover: requires: - setup_dependencies diff --git a/Makefile b/Makefile index abcdc57569..043645c670 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ godocs: ######################################## ### Testing -test: test_unit test_cli +test: test_unit test_cli: @go test -count 1 -p 1 `go list github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test` diff --git a/tests/test_cover.sh b/tests/test_cover.sh index 4f8aa55f1c..be6215b5a1 100644 --- a/tests/test_cover.sh +++ b/tests/test_cover.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -PKGS=$(go list ./... | grep -v /vendor/) +PKGS=$(go list ./... | grep -v /vendor/ | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test) set -e echo "mode: atomic" > coverage.txt