summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2023-05-08 22:52:34 +0200
committerGitHub <noreply@github.com>2023-05-08 22:52:34 +0200
commit46b165793a5156524ab81600bd3b708483b17fb3 (patch)
treed9a0ad7fbfc049b7881978880467ee7afdedd02e
parentafa043fd3f301ac12b107a722ef8aff861a0e8dc (diff)
parent112a557ca6969efde22d38a639ae5ecd8b597184 (diff)
Merge pull request #27038 from vespa-engine/mpolden/avoid-breaking-test-cache
Avoid breaking test cache
-rw-r--r--client/go/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/go/Makefile b/client/go/Makefile
index c70154eb247..9ad8a749fce 100644
--- a/client/go/Makefile
+++ b/client/go/Makefile
@@ -15,6 +15,7 @@ DIST ?= $(CURDIR)/dist
GO_FLAGS := -ldflags "-X github.com/vespa-engine/vespa/client/go/internal/build.Version=$(VERSION)"
GIT_ROOT := $(shell git rev-parse --show-toplevel)
+GO_TMPDIR := $(GIT_ROOT)/build/go
DIST_TARGETS := dist-mac dist-mac-arm64 dist-linux dist-linux-arm64 dist-win32 dist-win64
all: test checkfmt install
@@ -131,7 +132,7 @@ clean:
rmdir -p $(BIN) $(SHARE)/man/man1 > /dev/null 2>&1 || true
test: ci
- mkdir -p $(CURDIR)/tmp && TMPDIR=$(CURDIR)/tmp go test ./...
+ mkdir -p $(GO_TMPDIR) && GOTMPDIR=$(GO_TMPDIR) go test ./...
checkfmt:
@sh -c "test -z $$(gofmt -l .)" || { echo "one or more files need to be formatted: try make fmt to fix this automatically"; exit 1; }