@@ -4,116 +4,59 @@ import (
44 "bytes"
55 "context"
66 "flag"
7- "io"
87 "os"
98 "os/exec"
109 "path/filepath"
1110 "testing"
1211)
1312
1413func TestRun (t * testing.T ) {
15- t .Parallel ()
16-
1714 for _ , tc := range []struct {
1815 description string
1916 files map [string ]string
2017 args []string
2118 expectErr string
2219 }{
23- {
24- description : "pass" ,
25- files : map [string ]string {
26- "go.mod" : `
27- module foo
28- ` ,
29- "foo_test.go" : `
30- package foo
31-
32- import "testing"
33-
34- func TestFoo(t *testing.T) {
35- if false {
36- t.Errorf("foo failed")
37- }
38- }
39- ` ,
40- },
41- },
42- {
43- description : "fails" ,
44- files : map [string ]string {
45- "go.mod" : `
46- module foo
47- ` ,
48- "foo_test.go" : `
49- package foo
50-
51- import "testing"
52-
53- func TestFooFails(t *testing.T) {
54- t.Errorf("foo failed")
55- }
56- ` ,
57- },
58- expectErr : "exit with status 1" ,
59- },
6020 {
6121 description : "panic fails" ,
6222 files : map [string ]string {
6323 "go.mod" : `
6424module foo
65- ` ,
66- "foo_test.go" : `
67- package foo
6825
69- import "testing"
26+ go 1.19
27+ ` ,
28+ "foo.go" : `
29+ package main
7030
71- func TestFooPanic(t *testing.T ) {
31+ func main( ) {
7232 panic("failed")
7333}
7434` ,
7535 },
7636 expectErr : "exit with status 2" ,
7737 },
78- {
79- description : "panic in goroutine fails" ,
80- files : map [string ]string {
81- "go.mod" : `
82- module foo
83- ` ,
84- "foo_test.go" : `
85- package foo
86-
87- import "testing"
88-
89- func TestFooGoroutinePanic(t *testing.T) {
90- go panic("foo failed")
91- }
92- ` ,
93- },
94- expectErr : "exit with status 1" ,
95- },
9638 {
9739 description : "panic in next run of event loop fails" ,
9840 files : map [string ]string {
9941 "go.mod" : `
100- module foo
101- ` ,
102- "foo_test.go" : `
103- package foo
104-
105- import (
106- "syscall/js"
107- "testing"
108- )
109-
110- func TestFooNextEventLoopPanic(t *testing.T) {
111- js.Global().Call("setTimeout", js.FuncOf(func(js.Value, []js.Value) interface{} {
112- panic("bad")
113- return nil
114- }), 0)
115- }
116- ` ,
42+ module foo
43+
44+ go 1.19
45+ ` ,
46+ "foo.go" : `
47+ package main
48+
49+ import (
50+ "syscall/js"
51+ )
52+
53+ func main() {
54+ js.Global().Call("setTimeout", js.FuncOf(func(js.Value, []js.Value) any {
55+ panic("bad")
56+ return nil
57+ }), 0)
58+ }
59+ ` ,
11760 },
11861 expectErr : "context canceled" ,
11962 },
@@ -132,28 +75,13 @@ func TestFooNextEventLoopPanic(t *testing.T) {
13275 }
13376}
13477
135- type testWriter struct {
136- testingT * testing.T
137- }
138-
139- func testLogger (t * testing.T ) io.Writer {
140- return & testWriter {t }
141- }
142-
143- func (w * testWriter ) Write (b []byte ) (int , error ) {
144- w .testingT .Helper ()
145- w .testingT .Log (string (b ))
146- return len (b ), nil
147- }
148-
14978func testRun (t * testing.T , wasmFile string , flags ... string ) ([]byte , error ) {
15079 var logs bytes.Buffer
151- output := io .MultiWriter (testLogger (t ), & logs )
15280 flagSet := flag .NewFlagSet ("wasmbrowsertest" , flag .ContinueOnError )
15381 ctx , cancel := context .WithCancel (context .Background ())
15482 t .Cleanup (cancel )
15583
156- err := run (ctx , append ([]string {"go_js_wasm_exec" , wasmFile , "-test.v" }, flags ... ), output , flagSet )
84+ err := run (ctx , append ([]string {"go_js_wasm_exec" , wasmFile }, flags ... ), & logs , flagSet )
15785 return logs .Bytes (), err
15886}
15987
@@ -176,7 +104,7 @@ func writeFile(t *testing.T, baseDir, path, contents string) {
176104func buildTestWasm (t * testing.T , path string ) string {
177105 t .Helper ()
178106 outputFile := filepath .Join (t .TempDir (), "out.wasm" )
179- cmd := exec .Command ("go" , "test" , "-c ""-o" , outputFile , "." )
107+ cmd := exec .Command ("go" , "build " , "-o" , outputFile , "." )
180108 cmd .Dir = path
181109 cmd .Env = append (os .Environ (),
182110 "GOOS=js" ,
0 commit comments