From 6c651728d8d0871afb3cf0fb846d4bc2f888b310 Mon Sep 17 00:00:00 2001
From: Alex Brainman <alex.brainman@gmail.com>
Date: Fri, 1 Apr 2011 10:10:15 +1100
Subject: [PATCH] gotest: execute gomake properly on Windows

R=peterGo, rsc, Joe Poirier
CC=golang-dev
https://golang.org/cl/4280087
---
 src/cmd/gotest/gotest.go | 4 ++++
 1 file changed, 4 insertions(+)

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 {
-- 
2.48.1