diff --git a/Makefile b/Makefile index 06e5128a74..a1e647fb3e 100644 --- a/Makefile +++ b/Makefile @@ -571,6 +571,10 @@ ginkgo: ginkgo-remote: $(MAKE) ginkgo-run TAGS="$(REMOTETAGS) remote_testing" HACK= +.PHONY: testbindings +testbindings: .install.ginkgo + ACK_GINKGO_RC=true $(GINKGO) -v $(TESTFLAGS) -tags "$(TAGS) remote" $(GINKGOTIMEOUT) -progress -trace -noColor -debug -timeout 30m -v -r ./pkg/bindings/test + .PHONY: localintegration localintegration: test-binaries ginkgo diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 9160966b32..736fc704f2 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -101,11 +101,8 @@ function _run_bindings() { gitcommit_magic="/define.gitCommit=${GIT_COMMIT}" fi - # Subshell needed so logformatter will write output in cwd; if it runs in - # the subdir, .cirrus.yml will not find the html'ized log - (cd pkg/bindings/test && \ - echo "$gitcommit_magic" && \ - ginkgo -progress -trace -noColor -debug -timeout 30m -r -v) |& logformatter + (echo "$gitcommit_magic" && \ + make testbindings) |& logformatter } function _run_docker-py() {