gotest: execute gomake properly on Windows

R=peterGo, rsc, Joe Poirier
CC=golang-dev
https://golang.org/cl/4280087

diff --git a/src/cmd/gotest/gotest.go b/src/cmd/gotest/gotest.go
index 9dc10fd5db02db5dea31477b4b22ae455cfb7fb1..d110a8d1a53b19624f2ebddf27ed12e1e6f04583 100644 (file)
--- a/src/cmd/gotest/gotest.go
+++ b/src/cmd/gotest/gotest.go
@@ -250,6 +250,10 @@ func doRun(argv []string, returnStdout bool) string {
        if xFlag {
                fmt.Printf("gotest: %s\n", strings.Join(argv, " "))
        }
+       if runtime.GOOS == "windows" && argv[0] == "gomake" {
+               // gomake is a shell script and it cannot be executed directly on Windows.
+               argv = append([]string{"cmd", "/c", "sh", "-c"}, strings.Join(argv, " "))
+       }
        var err os.Error
        argv[0], err = exec.LookPath(argv[0])
        if err != nil {