diff --git a/GNUmakefile b/GNUmakefile index 325e5d197..84e7cff97 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -13,7 +13,7 @@ GO_TEST_CMD = $(if $(shell which gotestsum),gotestsum --,go test) ifeq ($(origin GOTEST_PKGS_EXCLUDE), undefined) GOTEST_PKGS ?= "./..." else -GOTEST_PKGS=$(shell go list ./... | sed 's/github.com\/hashicorp\/nomad/./' | egrep -v "^($(GOTEST_PKGS_EXCLUDE))$$") +GOTEST_PKGS=$(shell go list ./... | sed 's/github.com\/hashicorp\/nomad/./' | egrep -v "^($(GOTEST_PKGS_EXCLUDE))(/.*)?$$") endif default: help @@ -170,6 +170,7 @@ check: ## Lint the source code --deadline 10m \ --vendor \ --exclude='.*\.generated\.go' \ + --exclude='.*\.pb\.go' \ --exclude='.*bindata_assetfs\.go' \ --skip="ui/" \ --sort="path" \ diff --git a/client/fingerprint/storage_windows.go b/client/fingerprint/storage_windows.go index 716f1baf0..457b09b58 100644 --- a/client/fingerprint/storage_windows.go +++ b/client/fingerprint/storage_windows.go @@ -6,7 +6,7 @@ import ( "syscall" ) -//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zstorage_windows.go storage_windows.go +//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zstorage_windows.generated.go storage_windows.go //sys getDiskFreeSpaceEx(dirName *uint16, availableFreeBytes *uint64, totalBytes *uint64, totalFreeBytes *uint64) (err error) = kernel32.GetDiskFreeSpaceExW diff --git a/client/fingerprint/zstorage_windows.go b/client/fingerprint/zstorage_windows.generated.go similarity index 100% rename from client/fingerprint/zstorage_windows.go rename to client/fingerprint/zstorage_windows.generated.go