backport of commit 1ca57fc64e

3 weeks ago · 3ac40a2f50
parent 93e534ad92
commit 3ac40a2f50
3 changed files with 2 additions and 4 deletions
--- a/.github/workflows/test-race.yml
+++ b/.github/workflows/test-race.yml
@ -191,7 +191,6 @@ jobs:
      - name: Test
        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
        env:
-          TEST_PACKAGE: "./..."
          TEST_TIMEOUT: 120m
          TESTARGS: -race -v
        with:
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -189,7 +189,6 @@ jobs:
      - name: Test
        uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
        env:
-          TEST_PACKAGE: "./..."
          TESTARGS: -v
          TEST_TIMEOUT: 40m
        with:
--- a/4
+++ b/4
@ -6,7 +6,7 @@ THIS_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 TMP_DIR := $(shell mktemp -d)
 REPO_PATH := github.com/hashicorp/boundary

-TEST_PACKAGE ?= ./...
+TEST_PACKAGE ?= $(shell go list ./... | grep -v '/e2e')
 TEST_TIMEOUT ?= 30m

 CGO_ENABLED?=0
@ -326,7 +326,7 @@ test-sql:

 .PHONY: test
 test:
-	go test "$(TEST_PACKAGE)" -tags="$(BUILD_TAGS)" $(TESTARGS) -json -cover -timeout $(TEST_TIMEOUT) | tparse -follow
+	go test $(TEST_PACKAGE) -tags="$(BUILD_TAGS)" $(TESTARGS) -json -cover -timeout $(TEST_TIMEOUT) | tparse -follow

 .PHONY: test-sdk
 test-sdk: