1. docker
  2. Commit e593b72cc9d8a2fd9c7cd98b82ed468dfe3577e2
Browse code

Fix exclude list in make.ps1

Signed-off-by: Daniel Nephin <dnephin@docker.com>

Daniel Nephin authored on 2017/07/13 08:13:37
Showing 3 changed files
hack/make.ps1
History View file @ e593b72
... ... 
@@ -318,7 +318,7 @@ Function Run-UnitTests() {
318 318 
     $pkgList = $pkgList | Select-String -Pattern "github.com/docker/docker"
319 319 
     $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/vendor"
320 320 
     $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/man"
321 
-    $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/integration-cli"
321 
+    $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/integration"
322 322 
     $pkgList = $pkgList -replace "`r`n", " "
323 323 
     $goTestCommand = "go test" + $raceParm + " -cover -ldflags -w -tags """ + "autogen daemon" + """ -a """ + "-test.timeout=10m" + """ $pkgList"
324 324 
     Invoke-Expression $goTestCommand
hack/make/.integration-test-helpers
History View file @ e593b72
... ... 
@@ -26,7 +26,7 @@ run_test_integration() {
26 26
27 27 
 	(
28 28 
 		flags="-check.v -check.timeout=${TIMEOUT} -test.timeout=360m $TESTFLAGS"
29 
-		cd integration-cli > /dev/null
29 
+		cd integration-cli
30 30 
 		echo "Running $PWD"
31 31 
 		test_env ./test.main $flags
32 32 
 	)
hack/test/unit
History View file @ e593b72
... ... 
@@ -16,7 +16,7 @@ TESTFLAGS+=" -test.timeout=${TIMEOUT:-5m}"
16 16 
 BUILDFLAGS=( -tags "netgo seccomp libdm_no_deferred_remove" )
17 17 
 TESTDIRS="${TESTDIRS:-"./..."}"
18 18
19 
-exclude_paths="/vendor/|/integration-cli"
19 
+exclude_paths="/vendor/|/integration"
20 20 
 if [ "$(go env GOHOSTOS)" = 'solaris' ]; then
21 21 
 	exclude_paths="$exclude_paths|/daemon/graphdriver"
22 22 
 fi