From 5ca9c92bbe0db6ea5c75e726dd43fee1d039119d Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Fri, 5 Oct 2018 14:59:18 +0200 Subject: [PATCH] Added make target test-integration --- Makefile | 3 +++ build/docker/bin/Makefile | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 98d3959e..2709d73b 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ build-debug: .bin-image test: .bin-image docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src --network="host" $(BIN_IMAGE) make test ARGS="$(ARGS)" +test-integration: .bin-image + docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src --network="host" $(BIN_IMAGE) make test-integration ARGS="$(ARGS)" + test-all: .bin-image docker run -t --rm -e PACKAGER=$(PACKAGER) -e UPDATE_VENDOR=$(UPDATE_VENDOR) -v $(CURDIR):/src --network="host" $(BIN_IMAGE) make test-all ARGS="$(ARGS)" diff --git a/build/docker/bin/Makefile b/build/docker/bin/Makefile index a9afba42..89898263 100644 --- a/build/docker/bin/Makefile +++ b/build/docker/bin/Makefile @@ -26,7 +26,10 @@ tools: chown $(PACKAGER) /out/{ldb,sst_dump} test: prepare-sources - cd $(BLOCKBOOK_SRC) && go test -tags unittest `go list ./... | grep -v '^blockbook/contrib'` $(ARGS) + cd $(BLOCKBOOK_SRC) && go test -tags unittest `go list ./... | grep -vP '^blockbook/(contrib|tests)'` $(ARGS) + +test-integration: prepare-sources + cd $(BLOCKBOOK_SRC) && go test -tags integration `go list blockbook/tests/...` $(ARGS) test-all: prepare-sources cd $(BLOCKBOOK_SRC) && go test -tags 'unittest integration' `go list ./... | grep -v '^blockbook/contrib'` $(ARGS)