qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 22:04:39 -07:00
Code Releases Activity

os: change TestForkExec so it can run on windows

Browse Source 
R=brainman, vcc, Joe Poirier, rsc
CC=golang-dev
https://golang.org/cl/2530041
This commit is contained in:
Yasuhiro Matsumoto 2010-10-20 09:46:24 +11:00 committed by Alex Brainman
parent a3bcf4b664
commit a9725396c0
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pkg/os/os_test.go
View File

@ -410,15 +410,24 @@ func TestRename(t *testing.T) {
} }
func TestForkExec(t *testing.T) { func TestForkExec(t *testing.T) {
// TODO(brainman): Try to enable this test once ForkExec is working. var cmd, adir, expect string
if syscall.OS == "windows" { var args []string
return
}
r, w, err := Pipe() r, w, err := Pipe()
if err != nil { if err != nil {
t.Fatalf("Pipe: %v", err) t.Fatalf("Pipe: %v", err)
} }
pid, err := ForkExec("/bin/pwd", []string{"pwd"}, nil, "/", []*File{nil, w, Stderr}) if syscall.OS == "windows" {
cmd = Getenv("COMSPEC")
args = []string{Getenv("COMSPEC"), "/c cd"}
adir = Getenv("SystemRoot")
expect = Getenv("SystemRoot") + "\r\n"
} else {
cmd = "/bin/pwd"
args = []string{"pwd"}
adir = "/"
expect = "/\n"
}
pid, err := ForkExec(cmd, args, nil, adir, []*File{nil, w, Stderr})
if err != nil { if err != nil {
t.Fatalf("ForkExec: %v", err) t.Fatalf("ForkExec: %v", err)
} }
@ -427,9 +436,9 @@ func TestForkExec(t *testing.T) {
var b bytes.Buffer var b bytes.Buffer
io.Copy(&b, r) io.Copy(&b, r)
output := b.String() output := b.String()
expect := "/\n"
if output != expect { if output != expect {
t.Errorf("exec /bin/pwd returned %q wanted %q", output, expect) args[0] = cmd
t.Errorf("exec %q returned %q wanted %q", strings.Join(args, " "), output, expect)
} }
Wait(pid, 0) Wait(pid, 0)
} }