Merge pull request #166 from bytecodealliance/ydnar/test-module

tests: add standalone tests module for testing generated Go code

Author: ydnar

.github/dependabot.yaml

@@ -11,3 +11,9 @@ updates:
     schedule:
       interval: weekly
     open-pull-requests-limit: 10
+
+  - package-ecosystem: gomod
+    directory: "/tests"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 10

.github/workflows/test.yaml

@@ -7,8 +7,8 @@ on:
   pull_request:
 
 env:
-  wasm-tools-version: "1.218.0"
-  wasmtime-version: "25.0.1"
+  wasm-tools-version: "1.219.1"
+  wasmtime-version: "26.0.0"
 
 jobs:
   # Vet Go code
@@ -148,6 +148,12 @@ jobs:
       - name: Add Go wasm exec to $PATH
         run: echo "$(go env GOROOT)/misc/wasm" >> $GITHUB_PATH
 
+      - name: Regenerate Go
+        run: make tests/generated
+
+      - name: Verify repo is unchanged
+        run: git diff --exit-code HEAD
+
       - name: Test wasm/wasip1 with Go
         env:
           GOARCH: wasm
@@ -166,5 +172,9 @@ jobs:
         if: ${{ matrix.tinygo-version != '0.32.0' }}
         run: tinygo test -v -target=wasip2 ./...
 
+      - name: Test generated Go with TinyGo >= 0.34.0
+        if: ${{ matrix.tinygo-version != '0.32.0' && matrix.tinygo-version != '0.33.0' }}
+        run: tinygo test -v -target wasip2 ./tests/...
+
       - name: Verify repo is unchanged
         run: git diff --exit-code HEAD

.gitignore

@@ -1,2 +1,2 @@
 .DS_Store
-generated
+/generated

Makefile

@@ -13,11 +13,27 @@ $(wit_files):
 golden: json
 	go test ./wit -update
 
-# generated writes test Go code to the filesystem
+# generated generated writes test Go code to the filesystem
 .PHONY: generated
-generated: clean
+generated: clean json
 	go test ./wit/bindgen -write
 
 .PHONY: clean
 clean:
 	rm -rf ./generated/*
+
+# tests/generated writes generated Go code to the tests directory
+.PHONY: tests/generated
+tests/generated: json
+	go generate ./tests
+
+# test runs Go and TinyGo tests
+GOTESTARGS :=
+.PHONY: test
+test:
+	go test $(GOTESTARGS) ./...
+	GOARCH=wasm GOOS=wasip1 go test $(GOTESTARGS) ./...
+	tinygo test $(GOTESTARGS) ./...
+	tinygo test -target=wasip1 $(GOTESTARGS) ./...
+	tinygo test -target=wasip2 $(GOTESTARGS) ./...
+	tinygo test -target=wasip2 $(GOTESTARGS) ./tests/...

go.work

@@ -0,0 +1,6 @@
+go 1.22.0
+
+use (
+	.
+	./tests
+)

go.work.sum

@@ -0,0 +1,15 @@
+github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/urfave/cli-altsrc/v3 v3.0.0-alpha2/go.mod h1:Q79oyIY/z4jtzIrKEK6MUeWC7/szGr46x4QdOaOAIWc=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/gopher-lua v1.1.1/go.mod h1:GBR0iDaNXjAgGg9zfCvksxSRnQx76gclCIb7kdAd1Pw=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
+golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=

testdata/go.mod

@@ -0,0 +1,4 @@
+// This go.mod file exists to prevent the testdata directory from being included in module distribution.
+module testdata
+
+go 1.22.0