From 0639aab22e8948adaded5535730b143e96769de0 Mon Sep 17 00:00:00 2001
From: Guillaume Tardif <guillaume.tardif@docker.com>
Date: Wed, 8 Jul 2020 16:31:31 +0200
Subject: [PATCH] Allow single test run with make

---
 Makefile  | 13 +++++++------
 README.md |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a5a3d602..8cecf6f8 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ ifeq ($(UNAME_S),Darwin)
 endif
 
 GIT_TAG?=$(shell git describe --tags --match "v[0-9]*")
+TESTIFY_OPTS=$(if $(TESTIFY),-testify.m $(TESTIFY),)
 
 all: cli
 
@@ -37,14 +38,14 @@ cli: ## Compile the cli
 	--build-arg GIT_TAG=$(GIT_TAG) \
 	--output ./bin
 
-e2e-local: ## Run End to end local tests
-	go test -v ./tests/e2e ./tests/skip-win-ci-e2e ./local/e2e
+e2e-local: ## Run End to end local tests. set env TESTIFY=Test1 for running single test
+	go test -v ./tests/e2e ./tests/skip-win-ci-e2e ./local/e2e $(TESTIFY_OPTS)
 
-e2e-win-ci: ## Run End to end local tests on windows CI, no docker for linux containers available ATM
-	go test -v ./tests/e2e
+e2e-win-ci: ## Run End to end local tests on windows CI, no docker for linux containers available ATM. set env TESTIFY=Test1 for running single test
+	go test -v ./tests/e2e $(TESTIFY_OPTS)
 
-e2e-aci: ## Run End to end ACI tests (requires azure login)
-	go test -v ./tests/aci-e2e
+e2e-aci: ## Run End to end ACI tests. set env TESTIFY=Test1 for running single test
+	go test -v ./tests/aci-e2e $(TESTIFY_OPTS)
 
 cross: ## Compile the CLI for linux, darwin and windows
 	@docker build . --target cross \
diff --git a/README.md b/README.md
index dd82cea1..e083cb84 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ You might need to run again `docker login azure` to properly use the command lin
 
 You can also run a single ACI test from the test suite : 
 ```
-AZURE_TENANT_ID="xxx" AZURE_CLIENT_ID="yyy" AZURE_CLIENT_SECRET="yyy" go test -v ./tests/aci-e2e -testify.m  TestACIRunSingleContainer
+TESTIFY=TestACIRunSingleContainer AZURE_TENANT_ID="xxx" AZURE_CLIENT_ID="yyy" AZURE_CLIENT_SECRET="yyy" make e2e-aci
 ```
 
 ## Release