Skip to content

Commit

Permalink
Merge PR CosmWasm#14: Various buildsystem fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alessio authored and alexanderbez committed May 21, 2019
1 parent 5211e90 commit 5350d3b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
COMMIT := $(shell git log -1 --format='%H')
LEDGER_ENABLED ?= true
GOBIN ?= $(GOPATH)/bin

export GO111MODULE = on

Expand Down Expand Up @@ -116,20 +115,21 @@ distclean: clean
### Testing


check: check-unit
check: check-unit check-build
check-all: check check-race check-cover

check-unit:
@VERSION=$(VERSION) go test -mod=readonly -race -tags='ledger test_ledger_mock' ./...
@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' ./...

check-race:
@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' -race ./...
@VERSION=$(VERSION) go test -mod=readonly -race -tags='ledger test_ledger_mock' ./...

check-cover:
@go test -mod=readonly -timeout 30m -race -coverprofile=coverage.txt -covermode=atomic -tags='ledger test_ledger_mock' ./...

check-build: build
@go test -mod=readonly -p 4 `go list ./cli_test/...` -tags=cli_test

check-all: check-unit check-race check-cover check-build

lint: ci-lint
ci-lint:
Expand Down
2 changes: 1 addition & 1 deletion cli_test/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func NewFixtures(t *testing.T) *Fixtures {

buildDir := os.Getenv("BUILDDIR")
if buildDir == "" {
buildDir, err = filepath.Abs("../../../build/")
buildDir, err = filepath.Abs("../build/")
require.NoError(t, err)
}

Expand Down

0 comments on commit 5350d3b

Please sign in to comment.