[FAB-6340] Pass go test flags into docker tests

Change-Id: I1ab41794aa1530a137b895df470fb1e240594c59 Signed-off-by: Troy Ronda <troy.ronda@securekey.com>
hyperledger · Sep 28, 2017 · 8305ff0 · 8305ff0
1 parent a2f9ea8
commit 8305ff0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/Makefile b/Makefile
@@ -28,6 +28,7 @@ DOCKER_COMPOSE_CMD ?= docker-compose
 
 # Build flags (overridable)
 GO_LDFLAGS               ?= -ldflags=-s
+GO_TESTFLAGS             ?=
 FABRIC_SDK_EXPERIMENTAL  ?= true
 FABRIC_SDK_EXTRA_GO_TAGS ?=
 
@@ -74,6 +75,7 @@ export ARCH
 export GO_LDFLAGS
 export GO_DEP_COMMIT
 export GO_TAGS
+export GO_TESTFLAGS
 
 all: checks unit-test integration-test
 

diff --git a/test/fixtures/docker-compose-nopkcs11-test.yaml b/test/fixtures/docker-compose-nopkcs11-test.yaml
@@ -12,6 +12,7 @@ services:
     image: ${FABRIC_BASEOS_FIXTURE_IMAGE}:${ARCH}-${FABRIC_BASEOS_FIXTURE_TAG}
     environment:
       - GO_TAGS
+      - GO_TESTFLAGS
     volumes:
       - ../../:/opt/gopath/src/github.com/hyperledger/fabric-sdk-go
     command: /opt/gopath/src/github.com/hyperledger/fabric-sdk-go/test/scripts/integration.sh

diff --git a/test/fixtures/docker-compose-pkcs11-test.yaml b/test/fixtures/docker-compose-pkcs11-test.yaml
@@ -13,6 +13,7 @@ services:
     environment:
       - FABRIC_SDK_CLIENT_BCCSP_SECURITY_DEFAULT_PROVIDER=PKCS11
       - GO_TAGS
+      - GO_TESTFLAGS
     volumes:
       - ../../:/opt/gopath/src/github.com/hyperledger/fabric-sdk-go
     command: /opt/gopath/src/github.com/hyperledger/fabric-sdk-go/test/scripts/integration.sh