Skip to content

Commit 5dcfafd

Browse files
committed
Makefile,.github: nuke ginkgo usage from test runs.
Signed-off-by: Krisztian Litkey <[email protected]>
1 parent cb69307 commit 5dcfafd

File tree

2 files changed

+12
-22
lines changed

2 files changed

+12
-22
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,4 @@ jobs:
113113
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
114114
115115
- run: |
116-
make install-ginkgo test codecov
116+
make test codecov

Makefile

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ GO_BUILD_FLAGS ?=
2525
GO_MODULES := $(shell $(GO_CMD) list ./...)
2626

2727
GOLANG_CILINT := golangci-lint
28-
GINKGO := ginkgo
2928

3029
RESOLVED_PWD := $(shell realpath $(shell pwd))
3130
BUILD_PATH := $(RESOLVED_PWD)/build
@@ -71,7 +70,7 @@ clean: clean-plugins
7170

7271
allclean: clean clean-cache
7372

74-
test: test-gopkgs
73+
test: test-gopkgs test-plugins
7574

7675
generate: generate-golang
7776

@@ -135,24 +134,18 @@ $(BIN_PATH)/wasm build/bin/wasm: FORCE
135134
# test targets
136135
#
137136

138-
test-gopkgs: ginkgo-tests test-ulimits
139-
140-
SKIPPED_PKGS="ulimit-adjuster,device-injector"
141-
142-
ginkgo-tests:
143-
$(Q)$(GINKGO) run \
144-
--race \
145-
--trace \
146-
--cover \
147-
--covermode atomic \
148-
--output-dir $(COVERAGE_PATH) \
149-
--junit-report junit.xml \
150-
--coverprofile coverprofile \
151-
--succinct \
152-
--skip-package $(SKIPPED_PKGS) \
153-
-r && \
137+
test-gopkgs:
138+
$(Q)$(GO_TEST) \
139+
-race \
140+
-cover \
141+
-covermode=atomic \
142+
-coverprofile coverprofile \
143+
-outputdir $(COVERAGE_PATH) \
144+
./pkg/... && \
154145
$(GO_CMD) tool cover -html=$(COVERAGE_PATH)/coverprofile -o $(COVERAGE_PATH)/coverage.html
155146

147+
test-plugins: test-ulimits test-device-injector
148+
156149
test-ulimits:
157150
$(Q)cd ./plugins/ulimit-adjuster && $(GO_TEST) -v
158151

@@ -229,6 +222,3 @@ install-wasm-plugin:
229222

230223
install-protoc-dependencies:
231224
$(Q)GOBIN="$(PROTOC_PATH)/bin" $(GO_INSTALL) google.golang.org/protobuf/cmd/protoc-gen-go
232-
233-
install-ginkgo:
234-
$(Q)$(GO_INSTALL) -mod=mod github.com/onsi/ginkgo/v2/ginkgo

0 commit comments

Comments
 (0)