From 53fb990a89facdd5b689a3492ac5669c9b383c7f Mon Sep 17 00:00:00 2001 From: erickYan86 Date: Mon, 8 Apr 2019 10:34:05 +0800 Subject: [PATCH] remove some txpool tests --- .travis.yml | 12 ++++++------ Makefile | 7 ++----- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index e11e396a..70963bfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,12 +20,12 @@ go: 1.12 matrix: include: - - os: windows - before_install: - - go get golang.org/x/tools/cmd/cover - - go get github.com/mattn/goveralls - install: choco install mingw - script: travis_wait 30 mingw32-make test_win + # - os: windows + # before_install: + # - go get golang.org/x/tools/cmd/cover + # - go get github.com/mattn/goveralls + # install: choco install mingw + # script: travis_wait 30 mingw32-make test_win - os: linux before_install: diff --git a/Makefile b/Makefile index f89c6ea0..a4affb81 100644 --- a/Makefile +++ b/Makefile @@ -92,10 +92,7 @@ test: build_workspace .PHONY: test_win test_win: - @export GOPATH=${TEMP_GOPATH} - @echo ${TEMP_GOPATH} - @echo ${GOPATH} - @bash scripts/test.sh + @export GOPATH=${TEMP_GOPATH} && bash scripts/test.sh ### Clean up @@ -130,7 +127,7 @@ tag_release: test check docs all .PHONY: release release: test check docs all @scripts/is_checkout_dirty.sh || (echo "checkout is dirty so not releasing!" && exit 1) - @scripts/release.sh + @export GOPATH=${TEMP_GOPATH} && scripts/release.sh