gotest: another attempt to make it run on Windows

R=golang-dev, rsc1
CC=golang-dev
https://golang.org/cl/4347041

diff --git a/src/cmd/gotest/gotest.go b/src/cmd/gotest/gotest.go
index d110a8d1a53b19624f2ebddf27ed12e1e6f04583..f69c7286fc2ad4e7e9d48596c80687b1f2852c3f 100644 (file)
--- a/src/cmd/gotest/gotest.go
+++ b/src/cmd/gotest/gotest.go
@@ -252,7 +252,14 @@ func doRun(argv []string, returnStdout bool) string {
        }
        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, " "))
+               cmd := ""
+               for i, v := range argv {
+                       if i > 0 {
+                               cmd += " "
+                       }
+                       cmd += `"` + v + `"`
+               }
+               argv = []string{"cmd", "/c", "sh", "-c", cmd}
        }
        var err os.Error
        argv[0], err = exec.LookPath(argv[0])