Commit 6c651728 authored by Alex Brainman's avatar Alex Brainman

gotest: execute gomake properly on Windows

R=peterGo, rsc, Joe Poirier
CC=golang-dev
https://golang.org/cl/4280087
parent 554082d6
...@@ -250,6 +250,10 @@ func doRun(argv []string, returnStdout bool) string { ...@@ -250,6 +250,10 @@ func doRun(argv []string, returnStdout bool) string {
if xFlag { if xFlag {
fmt.Printf("gotest: %s\n", strings.Join(argv, " ")) 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 var err os.Error
argv[0], err = exec.LookPath(argv[0]) argv[0], err = exec.LookPath(argv[0])
if err != nil { if err != nil {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment