Skip to content

Commit

Permalink
test: don't run tests twice
Browse files Browse the repository at this point in the history
  • Loading branch information
jmattheis committed Sep 17, 2023
1 parent e0f86b6 commit a2b2f85
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 13 deletions.
7 changes: 2 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,16 @@ DOCKER_RUN=docker run --rm -v "$$PWD/.:${DOCKER_WORKDIR}" -v "`go env GOPATH`/pk
DOCKER_GO_BUILD=go build -mod=readonly -a -installsuffix cgo -ldflags "$$LD_FLAGS"
NODE_OPTIONS=$(shell if node --help | grep -q -- "--openssl-legacy-provider"; then echo --openssl-legacy-provider; fi)

test: test-coverage test-race test-js
test: test-coverage test-js
check: check-go check-swagger check-js
check-ci: check-swagger check-js

require-version:
if [ -n ${VERSION} ] && [[ $$VERSION == "v"* ]]; then echo "The version may not start with v" && exit 1; fi
if [ -z ${VERSION} ]; then echo "Need to set VERSION" && exit 1; fi;

test-race:
go test -race ./...

test-coverage:
go test -coverprofile=coverage.txt -covermode=atomic ./...
go test --race -coverprofile=coverage.txt -covermode=atomic ./...

format:
goimports -w $(shell find . -type f -name '*.go' -not -path "./vendor/*")
Expand Down
3 changes: 0 additions & 3 deletions auth/authentication_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build !race
// +build !race

package auth

import (
Expand Down
3 changes: 0 additions & 3 deletions auth/password/password_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//go:build !race
// +build !race

package password

import (
Expand Down
3 changes: 1 addition & 2 deletions plugin/manager_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//go:build (linux || darwin) && !race
//go:build linux || darwin
// +build linux darwin
// +build !race

package plugin

Expand Down

0 comments on commit a2b2f85

Please sign in to comment.