diff --git a/Makefile b/Makefile index f7f5cfd8..3c711309 100644 --- a/Makefile +++ b/Makefile @@ -7,11 +7,11 @@ bench: .PHONY: build.bench build.bench: - tinygo build -o bench/case/case.wasm -scheduler=none -target=wasi bench/case/case.go + tinygo build -o bench/testdata/case.wasm -scheduler=none -target=wasi bench/testdata/case.go .PHONY: build.examples build.examples: - @find ./examples/wasm -type f -name "*.go" | xargs -Ip /bin/sh -c 'tinygo build -o $$(echo p | sed -e 's/\.go/\.wasm/') -scheduler=none -target=wasi p' + @find ./examples/testdata -type f -name "*.go" | xargs -Ip /bin/sh -c 'tinygo build -o $$(echo p | sed -e 's/\.go/\.wasm/') -scheduler=none -target=wasi p' spectests_cases_dir := wasm/spectests/cases spec_version := wg-1.0 diff --git a/bench/bench_test.go b/bench/bench_test.go index bbd49c06..f72e4016 100644 --- a/bench/bench_test.go +++ b/bench/bench_test.go @@ -22,7 +22,7 @@ func BenchmarkEngines(b *testing.B) { } func setUpStore(store *wasm.Store) { - buf, err := os.ReadFile("case/case.wasm") + buf, err := os.ReadFile("testdata/case.wasm") if err != nil { panic(err) } diff --git a/bench/case/case.go b/bench/testdata/case.go similarity index 100% rename from bench/case/case.go rename to bench/testdata/case.go diff --git a/bench/case/case.wasm b/bench/testdata/case.wasm similarity index 99% rename from bench/case/case.wasm rename to bench/testdata/case.wasm index ca855011..b906223c 100755 Binary files a/bench/case/case.wasm and b/bench/testdata/case.wasm differ diff --git a/examples/README.md b/examples/README.md index 527122a7..186e22c6 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,4 +1,4 @@ This is where we put e2e tests of virtual machine. Please place examples so that `examples/foo_test.go` is testing -`examples/wasm/foo.wasm` binary which is generated by compiling -`examples/wasm/foo.go` with latest version of TinyGo. +`examples/testdata/foo.wasm` binary which is generated by compiling +`examples/testdata/foo.go` with latest version of TinyGo. diff --git a/examples/fibonacci_test.go b/examples/fibonacci_test.go index af797c6d..367bb909 100644 --- a/examples/fibonacci_test.go +++ b/examples/fibonacci_test.go @@ -12,7 +12,7 @@ import ( ) func Test_fibonacci(t *testing.T) { - buf, err := os.ReadFile("wasm/fibonacci.wasm") + buf, err := os.ReadFile("testdata/fibonacci.wasm") require.NoError(t, err) mod, err := wasm.DecodeModule(buf) diff --git a/examples/file_system_test.go b/examples/file_system_test.go index d3b0b770..f4921d2b 100644 --- a/examples/file_system_test.go +++ b/examples/file_system_test.go @@ -42,7 +42,7 @@ func readFile(fs wasi.FS, path string) ([]byte, error) { } func Test_file_system(t *testing.T) { - buf, err := os.ReadFile("wasm/file_system.wasm") + buf, err := os.ReadFile("testdata/file_system.wasm") require.NoError(t, err) mod, err := wasm.DecodeModule(buf) diff --git a/examples/host_func_test.go b/examples/host_func_test.go index 910e7577..7491cc49 100644 --- a/examples/host_func_test.go +++ b/examples/host_func_test.go @@ -15,7 +15,7 @@ import ( ) func Test_hostFunc(t *testing.T) { - buf, err := os.ReadFile("wasm/host_func.wasm") + buf, err := os.ReadFile("testdata/host_func.wasm") require.NoError(t, err) mod, err := wasm.DecodeModule((buf)) diff --git a/examples/simple_test.go b/examples/simple_test.go index 3af3f451..1c83a852 100644 --- a/examples/simple_test.go +++ b/examples/simple_test.go @@ -19,7 +19,7 @@ import ( // (start $hello) // ) func Test_Simple(t *testing.T) { - buf, err := os.ReadFile("wasm/simple.wasm") + buf, err := os.ReadFile("testdata/simple.wasm") require.NoError(t, err) mod, err := wasm.DecodeModule(buf) require.NoError(t, err) diff --git a/examples/stdio_test.go b/examples/stdio_test.go index 7980ce56..54fb3c2e 100644 --- a/examples/stdio_test.go +++ b/examples/stdio_test.go @@ -14,7 +14,7 @@ import ( ) func Test_stdio(t *testing.T) { - buf, err := os.ReadFile("wasm/stdio.wasm") + buf, err := os.ReadFile("testdata/stdio.wasm") require.NoError(t, err) mod, err := wasm.DecodeModule(buf) require.NoError(t, err) diff --git a/examples/wasm/fibonacci.go b/examples/testdata/fibonacci.go similarity index 100% rename from examples/wasm/fibonacci.go rename to examples/testdata/fibonacci.go diff --git a/examples/wasm/fibonacci.wasm b/examples/testdata/fibonacci.wasm similarity index 97% rename from examples/wasm/fibonacci.wasm rename to examples/testdata/fibonacci.wasm index 7f0a4829..c10508d7 100755 Binary files a/examples/wasm/fibonacci.wasm and b/examples/testdata/fibonacci.wasm differ diff --git a/examples/wasm/file_system.go b/examples/testdata/file_system.go similarity index 100% rename from examples/wasm/file_system.go rename to examples/testdata/file_system.go diff --git a/examples/wasm/file_system.wasm b/examples/testdata/file_system.wasm similarity index 98% rename from examples/wasm/file_system.wasm rename to examples/testdata/file_system.wasm index 0ec119fd..1580fac9 100755 Binary files a/examples/wasm/file_system.wasm and b/examples/testdata/file_system.wasm differ diff --git a/examples/wasm/host_func.go b/examples/testdata/host_func.go similarity index 100% rename from examples/wasm/host_func.go rename to examples/testdata/host_func.go diff --git a/examples/wasm/host_func.wasm b/examples/testdata/host_func.wasm similarity index 99% rename from examples/wasm/host_func.wasm rename to examples/testdata/host_func.wasm index 993da2fa..bf176cb4 100755 Binary files a/examples/wasm/host_func.wasm and b/examples/testdata/host_func.wasm differ diff --git a/examples/wasm/simple.wasm b/examples/testdata/simple.wasm similarity index 100% rename from examples/wasm/simple.wasm rename to examples/testdata/simple.wasm diff --git a/examples/wasm/stdio.go b/examples/testdata/stdio.go similarity index 100% rename from examples/wasm/stdio.go rename to examples/testdata/stdio.go diff --git a/examples/wasm/stdio.wasm b/examples/testdata/stdio.wasm similarity index 99% rename from examples/wasm/stdio.wasm rename to examples/testdata/stdio.wasm index d43f0e34..b963f789 100755 Binary files a/examples/wasm/stdio.wasm and b/examples/testdata/stdio.wasm differ diff --git a/examples/wasm/trap.go b/examples/testdata/trap.go similarity index 100% rename from examples/wasm/trap.go rename to examples/testdata/trap.go diff --git a/examples/wasm/trap.wasm b/examples/testdata/trap.wasm similarity index 98% rename from examples/wasm/trap.wasm rename to examples/testdata/trap.wasm index cc0d9d14..346df601 100755 Binary files a/examples/wasm/trap.wasm and b/examples/testdata/trap.wasm differ diff --git a/examples/trap_test.go b/examples/trap_test.go index 31c6f3be..50109874 100644 --- a/examples/trap_test.go +++ b/examples/trap_test.go @@ -12,7 +12,7 @@ import ( ) func Test_trap(t *testing.T) { - buf, err := os.ReadFile("wasm/trap.wasm") + buf, err := os.ReadFile("testdata/trap.wasm") require.NoError(t, err) mod, err := wasm.DecodeModule((buf))