File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed
Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change 11default : checks fmt lint
22
3- PACKAGES =./acceptance/... ./libs/... ./internal/... ./cmd/... ./bundle/... ./experimental/ssh/... .
3+ # gotestsum: when go test args are used with --rerun-fails the list of packages to test must be specified by the --packages flag
4+ PACKAGES =--packages "./acceptance/... ./libs/... ./internal/... ./cmd/... ./bundle/... ./experimental/ssh/... ."
45
56GO_TOOL ?= go tool -modfile=tools/go.mod
67GOTESTSUM_FORMAT ?= pkgname-and-test-fails
7- GOTESTSUM_CMD ?= ${GO_TOOL} gotestsum --format ${GOTESTSUM_FORMAT} --no-summary=skipped --jsonfile test-output.json
8+ GOTESTSUM_CMD ?= ${GO_TOOL} gotestsum --format ${GOTESTSUM_FORMAT} --no-summary=skipped --jsonfile test-output.json --rerun-fails
89LOCAL_TIMEOUT ?= 30m
910
1011
@@ -52,10 +53,10 @@ links:
5253checks : tidy ws links
5354
5455test :
55- ${GOTESTSUM_CMD} -- ${PACKAGES} -timeout=${LOCAL_TIMEOUT} -short
56+ ${GOTESTSUM_CMD} ${PACKAGES} -- -timeout=${LOCAL_TIMEOUT} -short
5657
5758test-slow :
58- ${GOTESTSUM_CMD} -- ${PACKAGES} -timeout=${LOCAL_TIMEOUT}
59+ ${GOTESTSUM_CMD} ${PACKAGES} -- -timeout=${LOCAL_TIMEOUT}
5960
6061# Updates acceptance test output (local tests)
6162test-update :
@@ -80,7 +81,7 @@ slowest:
8081
8182cover :
8283 rm -fr ./acceptance/build/cover/
83- VERBOSE_TEST=1 CLI_GOCOVERDIR=build/cover ${GOTESTSUM_CMD} -- -coverprofile=coverage.txt ${PACKAGES} -timeout=${LOCAL_TIMEOUT}
84+ VERBOSE_TEST=1 CLI_GOCOVERDIR=build/cover ${GOTESTSUM_CMD} ${PACKAGES} -- -coverprofile=coverage.txt -timeout=${LOCAL_TIMEOUT}
8485 rm -fr ./acceptance/build/cover-merged/
8586 mkdir -p acceptance/build/cover-merged/
8687 go tool covdata merge -i $$(printf '%s,' acceptance/build/cover/* | sed 's/,$$//' ) -o acceptance/build/cover-merged/
You can’t perform that action at this time.
0 commit comments