Browse Source

tools: Remove redundant grep -v vendors/ (#1996)

* tools: Remove redundant grep -v vendors/

This was used in conjunction with `go list <path>`, however `go list`
already ignores the vendor directory. This made this `grep -v` redundant.

* Missed an apostrophe
pull/2005/head
Dev Ojha 6 years ago
committed by Anton Kaliaev
parent
commit
3353bb99ae
3 changed files with 4 additions and 4 deletions
  1. +1
    -1
      .circleci/config.yml
  2. +2
    -2
      Makefile
  3. +1
    -1
      test/test_cover.sh

+ 1
- 1
.circleci/config.yml View File

@ -138,7 +138,7 @@ jobs:
- run: - run:
name: Run tests name: Run tests
command: | command: |
for pkg in $(go list github.com/tendermint/tendermint/... | grep -v /vendor/ | circleci tests split --split-by=timings); do
for pkg in $(go list github.com/tendermint/tendermint/... | circleci tests split --split-by=timings); do
id=$(basename "$pkg") id=$(basename "$pkg")
GOCACHE=off go test -v -timeout 5m -race -coverprofile=/tmp/workspace/profiles/$id.out -covermode=atomic "$pkg" | tee "/tmp/logs/$id-$RANDOM.log" GOCACHE=off go test -v -timeout 5m -race -coverprofile=/tmp/workspace/profiles/$id.out -covermode=atomic "$pkg" | tee "/tmp/logs/$id-$RANDOM.log"


+ 2
- 2
Makefile View File

@ -5,7 +5,7 @@ GOTOOLS = \
github.com/gogo/protobuf/protoc-gen-gogo \ github.com/gogo/protobuf/protoc-gen-gogo \
github.com/gogo/protobuf/gogoproto \ github.com/gogo/protobuf/gogoproto \
github.com/square/certstrap github.com/square/certstrap
PACKAGES=$(shell go list ./... | grep -v '/vendor/')
PACKAGES=$(shell go list ./...)
INCLUDE = -I=. -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf INCLUDE = -I=. -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf
BUILD_TAGS?=tendermint BUILD_TAGS?=tendermint
BUILD_FLAGS = -ldflags "-X github.com/tendermint/tendermint/version.GitCommit=`git rev-parse --short=8 HEAD`" BUILD_FLAGS = -ldflags "-X github.com/tendermint/tendermint/version.GitCommit=`git rev-parse --short=8 HEAD`"
@ -130,7 +130,7 @@ clean_certs:
rm -f db/remotedb/::.crt db/remotedb/::.key rm -f db/remotedb/::.crt db/remotedb/::.key
test_libs: gen_certs test_libs: gen_certs
GOCACHE=off go test -tags gcc $(shell go list ./... | grep -v vendor)
GOCACHE=off go test -tags gcc $(PACKAGES)
make clean_certs make clean_certs
grpc_dbserver: grpc_dbserver:


+ 1
- 1
test/test_cover.sh View File

@ -1,6 +1,6 @@
#! /bin/bash #! /bin/bash
PKGS=$(go list github.com/tendermint/tendermint/... | grep -v /vendor/)
PKGS=$(go list github.com/tendermint/tendermint/...)
set -e set -e


Loading…
Cancel
Save