Merge branch 'dev' into dev-verify

[bytom/bytom.git] / Makefile

diff --git a/Makefile b/Makefile
index a834c6e..da282ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@ ifeq ($(UNAME_S),Darwin)
 else ifeq ($(UNAME_S),Linux)
        GOOS := linux
 else
-$(error "$$GOOS is not defined.")
+$(error "$$GOOS is not defined. If you are using Windows, try to re-make using 'GOOS=windows make ...' ")
 endif
 endif
 
-PACKAGES    := $(shell go list ./... | grep -v '/vendor/')
+PACKAGES    := $(shell go list ./... | grep -v '/vendor/' | grep -v '/crypto/ed25519/chainkd')
 BUILD_FLAGS := -ldflags "-X github.com/bytom/version.GitCommit=`git rev-parse HEAD`"
 
 MINER_BINARY32 := miner-$(GOOS)_386
@@ -112,7 +112,7 @@ benchmark:
        go test -bench $(PACKAGES)
 
 functional-tests:
-       @go test -v -timeout=30m -tags=functional ./test
+       @go test -v -timeout=5m -tags=functional ./test
 
 ci: test functional-tests