Skip to content

Commit d27e7c6

Browse files
committed
Fix make test as boilerplate test target
Boilerplate runs make test but this target was redefined some time ago and thus not executed in CI.
1 parent b1e891f commit d27e7c6

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ build: build-interceptor build-cadctl build-template-updater ## Build all subpro
2626
.PHONY: lint
2727
lint: lint-cadctl lint-interceptor lint-template-updater ## Lint all subprojects
2828

29+
.PHONY: test
30+
test: test-cadctl test-interceptor
31+
2932
##@ cadctl:
3033
.PHONY: cadctl
3134
cadctl: generate-cadctl build-cadctl test-cadctl lint-cadctl generate-template-file ## Run all targets for cadctl (generate, build, test, lint, generation)
@@ -54,7 +57,7 @@ test-cadctl: check-go121-install ## Run automated tests for cadctl
5457

5558
##@ Interceptor:
5659
.PHONY: interceptor
57-
interceptor: build-interceptor test-interceptor lint-interceptor ## Run all targets for interceptor (build, test, lint)
60+
interceptor: build-interceptor test-interceptor test-interceptor-e2e lint-interceptor ## Run all targets for interceptor (build, test, lint)
5861

5962
.PHONY: build-interceptor
6063
build-interceptor: check-go121-install ## Build the interceptor binary
@@ -69,10 +72,13 @@ lint-interceptor: install-linter ## Lint interceptor subproject
6972
cd interceptor && GOLANGCI_LINT_CACHE=$$(mktemp -d) $(GOPATH)/bin/golangci-lint run -c ../.golangci.yml
7073

7174
.PHONY: test-interceptor
72-
test-interceptor: check-go121-install check-jq-install check-vault-install build-interceptor ## Run automated tests for interceptor
75+
test-interceptor: check-go121-install check-jq-install build-interceptor ## Run unit tests for interceptor
7376
@echo
7477
@echo "Running unit tests for interceptor..."
7578
cd interceptor && go test -race -mod=readonly ./...
79+
80+
.PHONY: test-interceptor-e2e
81+
test-interceptor-e2e: check-go121-install check-jq-install check-vault-install build-interceptor ## Run e2e tests for interceptor
7682
@echo
7783
@echo "Running e2e tests for interceptor..."
7884
cd interceptor && ./test/e2e.sh

0 commit comments

Comments
 (0)