Skip to content

Commit e32b4fe

Browse files
committed
Run unit tests only once
1 parent 7deb6a4 commit e32b4fe

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

.github/workflows/build-and-test.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ jobs:
173173
- name: Run Unit Tests
174174
run: |
175175
make -j4 gotest-with-junit
176-
- name: Run Unit Tests with GODEBUG=fips140=only
177-
run: |
178-
make -j4 gotest-fips140-only
179176
- uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
180177
with:
181178
name: test-results-${{ runner.os }}-${{ matrix.runner }}-${{ matrix.go-version }}

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ gomoddownload:
5050
gotest:
5151
@$(MAKE) for-all-target TARGET="test"
5252

53-
.PHONY: gotest-fips140-only
54-
gotest-fips140-only:
55-
@$(MAKE) for-all-target TARGET="test-fips140-only"
56-
5753
.PHONY: gobenchmark
5854
gobenchmark:
5955
@$(MAKE) for-all-target TARGET="benchmark"

Makefile.Common

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,9 @@ JUNIT_OUT_DIR ?= $(TOOLS_MOD_DIR)/testresults
2525

2626
.PHONY: test
2727
test:
28-
$(GO_TOOL) gotestsum --packages="./..." -- $(GOTEST_OPT)
29-
30-
.PHONY: test-fips140-only
31-
test-fips140-only:
32-
GODEBUG=tlsmlkem=0 $(GOCMD) mod download
33-
GODEBUG=fips140=only $(GO_TOOL) gotestsum --packages="./..." -- $(GOTEST_OPT) -tags=requirefips
28+
# GODEBUG=fips140=only is used to surface any FIPS-140-3 non-compliant cryptographic
29+
# calls into the Go standard library. See: https://go.dev/doc/security/fips140#fips-140-3-mode
30+
GODEBUG=fips140=only $(GO_TOOL) gotestsum --packages="./..." -- $(GOTEST_OPT)
3431

3532
.PHONY: test-with-cover
3633
test-with-cover:

0 commit comments

Comments
 (0)