Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert tests to plain go tests #122

Merged
merged 1 commit into from
Nov 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 5 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,19 +34,19 @@ endif
# by default, do not run the manager with webhooks enabled. This only affects local runs, not the build or in-cluster deployments.
ENABLE_WEBHOOKS ?= false

# If we are running in CI, run ginkgo with the recommended CI settings
# If we are running in CI, run go test in verbose mode
ifeq (,$(CI))
GINKGO_OPTS=-r
GOTEST_OPTS=-race
else
GINKGO_OPTS=-r --randomizeAllSpecs --randomizeSuites --failOnPending --cover --trace --race --progress --compilers=2 -v
GOTEST_OPTS=-race -v
endif

all: manager
ci: test

# Run tests
test: ginkgo generate fmt vet manifests
$(GINKGO) $(GINKGO_OPTS)
test: generate fmt vet manifests
go test ${GOTEST_OPTS} ./...

# Build manager binary
manager: generate fmt vet
Expand Down Expand Up @@ -125,19 +125,6 @@ else
CONTROLLER_GEN=$(shell which controller-gen)
endif

# find or download ginkgo
# download ginkgo if necessary
ginkgo:
ifeq (, $(shell which ginkgo))
@{ \
set -e ;\
go get github.com/onsi/ginkgo/ginkgo@v1.14.2 ;\
}
GINKGO=$(GOBIN)/ginkgo
else
GINKGO=$(shell which ginkgo)
endif

kustomize:
ifeq (, $(shell which kustomize))
@{ \
Expand Down
Loading