From e1a7b563089d51a292b45c87c7f9437bd33e14b0 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Mon, 11 Mar 2019 16:02:55 +0000
Subject: [PATCH] Allow control over dirs passed to e2e and unit tests

Allows e.g.:

    $ make -f docker.Makefile TESTDIRS=./cli/command/trust/... test-unit

Signed-off-by: Ian Campbell <ijc@docker.com>
---
 Makefile             | 2 +-
 docker.Makefile      | 2 +-
 scripts/test/e2e/run | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 64e01609ff..6f9abf9179 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ clean: ## remove build artifacts
 
 .PHONY: test-unit
 test-unit: ## run unit tests, to change the output format use: GOTESTSUM_FORMAT=(dots|short|standard-quiet|short-verbose|standard-verbose) make test-unit 
-	gotestsum $(TESTFLAGS) -- $(shell go list ./... | grep -vE '/vendor/|/e2e/')
+	gotestsum $(TESTFLAGS) -- $${TESTDIRS:-$(shell go list ./... | grep -vE '/vendor/|/e2e/')}
 
 .PHONY: test
 test: test-unit ## run tests
diff --git a/docker.Makefile b/docker.Makefile
index ce770ca9c6..5571b498ef 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -21,7 +21,7 @@ ifeq ($(DOCKER_CLI_GO_BUILD_CACHE),y)
 DOCKER_CLI_MOUNTS += -v "$(CACHE_VOLUME_NAME):/root/.cache/go-build"
 endif
 VERSION = $(shell cat VERSION)
-ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM -e TESTFLAGS
+ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM -e TESTFLAGS -e TESTDIRS
 
 # build docker image (dockerfiles/Dockerfile.build)
 .PHONY: build_docker_image
diff --git a/scripts/test/e2e/run b/scripts/test/e2e/run
index 51dc24ff17..70fb798a8f 100755
--- a/scripts/test/e2e/run
+++ b/scripts/test/e2e/run
@@ -70,7 +70,7 @@ function runtests {
         GOPATH="$GOPATH" \
         PATH="$PWD/build/:/usr/bin:/usr/local/bin:/usr/local/go/bin" \
         DOCKER_CLI_E2E_PLUGINS_EXTRA_DIRS="$PWD/build/plugins-linux-amd64" \
-        "$(command -v gotestsum)" -- ./e2e/... ${TESTFLAGS-}
+        "$(command -v gotestsum)" -- ${TESTDIRS:-./e2e/...} ${TESTFLAGS-}
 }
 
 export unique_id="${E2E_UNIQUE_ID:-cliendtoendsuite}"