From 2420fe3d756eaaf019003e0409f9100a3a42fdae Mon Sep 17 00:00:00 2001 From: Edward McFarlane Date: Mon, 4 Nov 2024 09:57:39 -0500 Subject: [PATCH] Add overrides --- make/go/buf.mk | 5 ----- make/go/go.mk | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/make/go/buf.mk b/make/go/buf.mk index 1eb7042385..c61e6795f2 100644 --- a/make/go/buf.mk +++ b/make/go/buf.mk @@ -62,8 +62,3 @@ bufbreaking: $(BUF) postlint:: bufbreaking endif endif - -.PHONY: updatebufversion -updatebufversion: - $(SED_I) -E "s/BUF_VERSION \?=.*/BUF_VERSION ?= ${RELEASE_BUF_VERSION}/" "make/go/dep_buf.mk" - $(SED_I) -E "s/\# https\:\/\/github.com\/bufbuild\/buf\/releases.*/\# https\:\/\/github.com\/bufbuild\/buf\/releases $(shell date "+%Y%m%d") checked $(shell date "+%Y%m%d")/" "make/go/dep_buf.mk" diff --git a/make/go/go.mk b/make/go/go.mk index 4854323e3c..1c153003c9 100644 --- a/make/go/go.mk +++ b/make/go/go.mk @@ -16,6 +16,8 @@ GO_BINS ?= # Settable GO_TEST_BINS ?= # Settable +GO_TEST_WASM_BINS ?= +# Settable GO_GET_PKGS ?= # Settable GO_MOD_VERSION ?= 1.22 @@ -142,7 +144,7 @@ build: prebuild ## Run go build. pretest:: .PHONY: test -test: pretest installtest ## Run all go tests. +test: pretest installtest installtestwasm ## Run all go tests. go test $(GO_TEST_FLAGS) $(GOPKGS) .PHONY: testrace @@ -203,3 +205,17 @@ endef $(foreach gobin,$(sort $(GO_TEST_BINS)),$(eval $(call gotestbinfunc,$(gobin)))) $(foreach gobin,$(sort $(GO_TEST_BINS)),$(eval FILE_IGNORES := $(FILE_IGNORES) $(gobin)/$(notdir $(gobin)))) + +.PHONY: installtestwasm +installtestwasm:: + +define gotestwasmfunc +.PHONY: installtestwasm$(notdir $(1)) +installtestwasm$(notdir $(1)): + GOOS=wasip1 GOARCH=wasm go build -o $(GOBIN)/$(notdir $(1)).wasm ./$(1) + +installtestwasm:: installtestwasm$(notdir $(1)) +endef + +$(foreach gobin,$(sort $(GO_TEST_WASM_BINS)),$(eval $(call gotestwasmfunc,$(gobin)))) +$(foreach gobin,$(sort $(GO_TEST_WASM_BINS)),$(eval FILE_IGNORES := $(FILE_IGNORES) $(gobin)/$(notdir $(gobin))))