From 48f5d911ea2a09f9850583f7480f420c0711f29d Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Wed, 12 Jul 2017 19:13:37 -0400
Subject: [PATCH] Fix exclude list in make.ps1

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e593b72cc9d8a2fd9c7cd98b82ed468dfe3577e2
Component: engine
---
 components/engine/hack/make.ps1                       | 2 +-
 components/engine/hack/make/.integration-test-helpers | 2 +-
 components/engine/hack/test/unit                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/engine/hack/make.ps1 b/components/engine/hack/make.ps1
index ac3e369048..f3f45e3d00 100644
--- a/components/engine/hack/make.ps1
+++ b/components/engine/hack/make.ps1
@@ -318,7 +318,7 @@ Function Run-UnitTests() {
     $pkgList = $pkgList | Select-String -Pattern "github.com/docker/docker"
     $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/vendor"
     $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/man"
-    $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/integration-cli"
+    $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/integration"
     $pkgList = $pkgList -replace "`r`n", " "
     $goTestCommand = "go test" + $raceParm + " -cover -ldflags -w -tags """ + "autogen daemon" + """ -a """ + "-test.timeout=10m" + """ $pkgList"
     Invoke-Expression $goTestCommand
diff --git a/components/engine/hack/make/.integration-test-helpers b/components/engine/hack/make/.integration-test-helpers
index 31a4782bdc..288be863ce 100644
--- a/components/engine/hack/make/.integration-test-helpers
+++ b/components/engine/hack/make/.integration-test-helpers
@@ -26,7 +26,7 @@ run_test_integration() {
 
 	(
 		flags="-check.v -check.timeout=${TIMEOUT} -test.timeout=360m $TESTFLAGS"
-		cd integration-cli > /dev/null
+		cd integration-cli
 		echo "Running $PWD"
 		test_env ./test.main $flags
 	)
diff --git a/components/engine/hack/test/unit b/components/engine/hack/test/unit
index 0018e88454..2b07089bcf 100755
--- a/components/engine/hack/test/unit
+++ b/components/engine/hack/test/unit
@@ -16,7 +16,7 @@ TESTFLAGS+=" -test.timeout=${TIMEOUT:-5m}"
 BUILDFLAGS=( -tags "netgo seccomp libdm_no_deferred_remove" )
 TESTDIRS="${TESTDIRS:-"./..."}"
 
-exclude_paths="/vendor/|/integration-cli"
+exclude_paths="/vendor/|/integration"
 if [ "$(go env GOHOSTOS)" = 'solaris' ]; then
 	exclude_paths="$exclude_paths|/daemon/graphdriver"
 fi