From: Alex Brainman <alex.brainman@gmail.com>
Date: Thu, 31 Mar 2011 23:10:15 +0000 (+1100)
Subject: gotest: execute gomake properly on Windows
X-Git-Tag: weekly.2011-04-04~30
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6c651728d8d0871afb3cf0fb846d4bc2f888b310;p=gostls13.git

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 9dc10fd5db..d110a8d1a5 100644
--- 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 {