summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-02 16:02:55 -0500
committerGitHub <noreply@github.com>2021-02-02 16:02:55 -0500
commitd1e0afdd47c1868ce0d22e48ae9b0b9d89ba6274 (patch)
treefa848cea4a688624435270bfbe5d6f46681c6f60
parentaab8a934f5bd9bc58959c49f334d3ba57a0f5135 (diff)
parente9f936a29daae4620e26c707cc65ed87d2cd18d8 (diff)
downloadpodman-d1e0afdd47c1868ce0d22e48ae9b0b9d89ba6274.tar.gz
podman-d1e0afdd47c1868ce0d22e48ae9b0b9d89ba6274.tar.bz2
podman-d1e0afdd47c1868ce0d22e48ae9b0b9d89ba6274.zip
Merge pull request #9200 from edsantiago/make_ginkgo_refactor
Makefile: refactor ginkgo * ginkgo-remote
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index a5e126176..9e4ff47f4 100644
--- a/Makefile
+++ b/Makefile
@@ -303,13 +303,17 @@ localunit: test/goecho/goecho
.PHONY: test
test: localunit localintegration remoteintegration localsystem remotesystem ## Run unit, integration, and system tests.
+.PHONY: ginkgo-run
+ginkgo-run:
+ $(GOBIN)/ginkgo -v $(TESTFLAGS) -tags "$(TAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes 3 -debug test/e2e/. $(HACK)
+
.PHONY: ginkgo
ginkgo:
- $(GOBIN)/ginkgo -v $(TESTFLAGS) -tags "$(BUILDTAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes 3 -debug test/e2e/. hack/.
+ $(MAKE) ginkgo-run TAGS="$(BUILDTAGS)" HACK=hack/.
.PHONY: ginkgo-remote
ginkgo-remote:
- $(GOBIN)/ginkgo -v $(TESTFLAGS) -tags "$(REMOTETAGS)" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/.
+ $(MAKE) ginkgo-run TAGS="$(REMOTETAGS)" HACK=
.PHONY: localintegration
localintegration: test-binaries ginkgo