make,builder: incorporate feedback from code review on Go 1.15 update

deadprogram · deadprogram · commit ecda88bcf86f · 2020-08-17T17:43:08.000+02:00
Signed-off-by: deadprogram &lt;ron@hybridgroup.com&gt;
diff --git a/Makefile b/Makefile
@@ -346,7 +346,7 @@ endif
 	@$(MD5SUM) test.elf
 
 wasmtest:
-	$(GO) test -buildmode exe ./tests/wasm
+	$(GO) test ./tests/wasm
 
 build/release: tinygo gen-device wasi-libc
 	@mkdir -p build/release/tinygo/bin
diff --git a/builder/config.go b/builder/config.go
@@ -26,7 +26,7 @@ func NewConfig(options *compileopts.Options) (*compileopts.Config, error) {
 		return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)
 	}
 	if major != 1 || minor < 11 || minor > 15 {
-		return nil, fmt.Errorf("requires go version 1.11 thru 1.15, got go%d.%d", major, minor)
+		return nil, fmt.Errorf("requires go version 1.11 through 1.15, got go%d.%d", major, minor)
 	}
 	clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))
 	return &compileopts.Config{

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func NewConfig(options compileopts.Options) (compileopts.Config, error) {`
`26`	`26`	`return nil, fmt.Errorf("could not read version from GOROOT (%v): %v", goroot, err)`
`27`	`27`	`}`
`28`	`28`	`if major != 1 \|\| minor < 11 \|\| minor > 15 {`
`29`		`- return nil, fmt.Errorf("requires go version 1.11 thru 1.15, got go%d.%d", major, minor)`
	`29`	`+ return nil, fmt.Errorf("requires go version 1.11 through 1.15, got go%d.%d", major, minor)`
`30`	`30`	`}`
`31`	`31`	`clangHeaderPath := getClangHeaderPath(goenv.Get("TINYGOROOT"))`
`32`	`32`	`return &compileopts.Config{`