Browse Source

test: remove "./cmd", "etcd_setup_gopath"

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 8 years ago
parent
commit
6eefc93343
1 changed files with 2 additions and 5 deletions
  1. 2 5
      test

+ 2 - 5
test

@@ -21,9 +21,6 @@ if [[ "${PASSES}" == *"functional"* ]]; then
 	./tools/functional-tester/build
 	./tools/functional-tester/build
 fi
 fi
 
 
-# build tests with vendored dependencies
-etcd_setup_gopath
-
 if [ -z "$PASSES" ]; then
 if [ -z "$PASSES" ]; then
 	PASSES="fmt bom dep compile build unit"
 	PASSES="fmt bom dep compile build unit"
 fi
 fi
@@ -34,7 +31,7 @@ USERPKG=${PKG:-}
 COVER=${COVER:-"-cover"}
 COVER=${COVER:-"-cover"}
 
 
 # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
 # Hack: gofmt ./ will recursively check the .git directory. So use *.go for gofmt.
-IGNORE_PKGS="(cmd/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
+IGNORE_PKGS="(vendor/|etcdserverpb|rafttest|gopath.proto|v3lockpb|v3electionpb)"
 INTEGRATION_PKGS="(integration|e2e|contrib|functional-tester)"
 INTEGRATION_PKGS="(integration|e2e|contrib|functional-tester)"
 
 
 # all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools
 # all github.com/coreos/etcd/whatever pkgs that are not auto-generated / tools
@@ -431,7 +428,7 @@ function nakedret_pass {
 
 
 function license_header_pass {
 function license_header_pass {
 	licRes=""
 	licRes=""
-	files=$(find . -type f -iname '*.go' ! -path './cmd/*' ! -path './gopath.proto/*')
+	files=$(find . -type f -iname '*.go' ! -path './vendor/*' ! -path './gopath.proto/*')
 	for file in $files; do
 	for file in $files; do
 		if ! head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" ; then
 		if ! head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" ; then
 			licRes="${licRes}"$(echo -e "  ${file}")
 			licRes="${licRes}"$(echo -e "  ${file}")