fix test discovery
This commit is contained in:
		
							parent
							
								
									4e6266babf
								
							
						
					
					
						commit
						c07148af13
					
				
							
								
								
									
										8
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										8
									
								
								Makefile
								
								
								
								
							|  | @ -20,7 +20,7 @@ GITSTATUS = $(shell git status --porcelain || echo "no changes") | ||||||
| SOURCES = cmd/main.go | SOURCES = cmd/main.go | ||||||
| VERSION ?= $(shell git describe --tags --always --dirty) | VERSION ?= $(shell git describe --tags --always --dirty) | ||||||
| DIRS := cmd pkg | DIRS := cmd pkg | ||||||
| PKG := `go list ./... | grep --invert-match -e /vendor/ -e /kubectl-pg -e workspace` | PKG := `go list ./... | grep --invert-match -e /vendor/ -e /kubectl-pg` | ||||||
| 
 | 
 | ||||||
| ifeq ($(DEBUG),1) | ifeq ($(DEBUG),1) | ||||||
| 	DOCKERFILE = DebugDockerfile | 	DOCKERFILE = DebugDockerfile | ||||||
|  | @ -85,7 +85,7 @@ tools: | ||||||
| fmt: | fmt: | ||||||
| 	@gofmt -l -w -s $(DIRS) | 	@gofmt -l -w -s $(DIRS) | ||||||
| 
 | 
 | ||||||
| vet: | vet: fmt | ||||||
| 	@go vet $(PKG) | 	@go vet $(PKG) | ||||||
| 	@ineffassign kubectl-pg pkg | 	@ineffassign kubectl-pg pkg | ||||||
| 	@staticcheck $(PKG) | 	@staticcheck $(PKG) | ||||||
|  | @ -93,9 +93,9 @@ vet: | ||||||
| deps: | deps: | ||||||
| 	@glide install --strip-vendor | 	@glide install --strip-vendor | ||||||
| 
 | 
 | ||||||
| test: vet | test: | ||||||
| 	hack/verify-codegen.sh | 	hack/verify-codegen.sh | ||||||
| 	@go test $(PKG) | 	@go test ./... | ||||||
| 
 | 
 | ||||||
| e2e: docker # build operator image to be tested
 | e2e: docker # build operator image to be tested
 | ||||||
| 	cd e2e; make tools test clean | 	cd e2e; make tools test clean | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue