exec.LookPath() unix/windows separation

R=brainman, rsc, vcc, rsc1
CC=golang-dev
https://golang.org/cl/2068041
This commit is contained in:
Joe Poirier 2010-09-12 17:38:36 +10:00 committed by Alex Brainman
parent e181bf6e2f
commit b155a76a40
5 changed files with 153 additions and 44 deletions

View file

@ -12,7 +12,11 @@ import (
)
func TestRunCat(t *testing.T) {
cmd, err := Run("/bin/cat", []string{"cat"}, nil, "",
cat, err := LookPath("cat")
if err != nil {
t.Fatal("cat: ", err)
}
cmd, err := Run(cat, []string{"cat"}, nil, "",
Pipe, Pipe, DevNull)
if err != nil {
t.Fatal("run:", err)
@ -32,7 +36,11 @@ func TestRunCat(t *testing.T) {
}
func TestRunEcho(t *testing.T) {
cmd, err := Run("/bin/echo", []string{"echo", "hello", "world"}, nil, "",
echo, err := LookPath("echo")
if err != nil {
t.Fatal("echo: ", err)
}
cmd, err := Run(echo, []string{"echo", "hello", "world"}, nil, "",
DevNull, Pipe, DevNull)
if err != nil {
t.Fatal("run:", err)
@ -50,7 +58,11 @@ func TestRunEcho(t *testing.T) {
}
func TestStderr(t *testing.T) {
cmd, err := Run("/bin/sh", []string{"sh", "-c", "echo hello world 1>&2"}, nil, "",
sh, err := LookPath("sh")
if err != nil {
t.Fatal("sh: ", err)
}
cmd, err := Run(sh, []string{"sh", "-c", "echo hello world 1>&2"}, nil, "",
DevNull, DevNull, Pipe)
if err != nil {
t.Fatal("run:", err)
@ -67,9 +79,12 @@ func TestStderr(t *testing.T) {
}
}
func TestMergeWithStdout(t *testing.T) {
cmd, err := Run("/bin/sh", []string{"sh", "-c", "echo hello world 1>&2"}, nil, "",
sh, err := LookPath("sh")
if err != nil {
t.Fatal("sh: ", err)
}
cmd, err := Run(sh, []string{"sh", "-c", "echo hello world 1>&2"}, nil, "",
DevNull, Pipe, MergeWithStdout)
if err != nil {
t.Fatal("run:", err)
@ -91,7 +106,11 @@ func TestAddEnvVar(t *testing.T) {
if err != nil {
t.Fatal("setenv:", err)
}
cmd, err := Run("/bin/sh", []string{"sh", "-c", "echo $NEWVAR"}, nil, "",
sh, err := LookPath("sh")
if err != nil {
t.Fatal("sh: ", err)
}
cmd, err := Run(sh, []string{"sh", "-c", "echo $NEWVAR"}, nil, "",
DevNull, Pipe, DevNull)
if err != nil {
t.Fatal("run:", err)