From d53c8de06b93ea6775cffc87087f47e8dd1552b9 Mon Sep 17 00:00:00 2001
From: Eli Uriegas <eli.uriegas@docker.com>
Date: Wed, 30 Aug 2017 15:06:22 -0700
Subject: [PATCH] Re-adds test target to the Makefile

The test target existed before, this is to provide a legacy interface to
allow easy testing for downstream Docker CE.

Without this we would need separate Makefiles/Jenkinsfiles for releases
past 17.07. Later on this target could also be used to test both unit
tests and integration tests at the same time.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
---
 Makefile        | 3 +++
 docker.Makefile | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 17ba8e5b2d..f6e73e0671 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,9 @@ clean: ## remove build artifacts
 test-unit: ## run unit test
 	./scripts/test/unit $(shell go list ./... | grep -vE '/vendor/|/e2e/')
 
+.PHONY: test
+test: test-unit ## run tests
+
 .PHONY: test-coverage
 test-coverage: ## run test coverage
 	./scripts/test/unit-with-coverage $(shell go list ./... | grep -vE '/vendor/|/e2e/')
diff --git a/docker.Makefile b/docker.Makefile
index 097ad49399..79f7b3c42c 100644
--- a/docker.Makefile
+++ b/docker.Makefile
@@ -46,6 +46,9 @@ clean: build_docker_image
 test-unit: build_docker_image
 	docker run --rm $(ENVVARS) $(MOUNTS) $(DEV_DOCKER_IMAGE_NAME) make test-unit
 
+.PHONY: test
+test: test-unit test-e2e
+
 # build the CLI for multiple architectures using a container
 .PHONY: cross
 cross: build_cross_image