From b7582852f63fd8bedba53ab415c1b3cc5ac2ae9c Mon Sep 17 00:00:00 2001 From: Alex Brainman Date: Sat, 28 May 2011 21:26:03 +1000 Subject: gotest, pkg/exec: use bash instead of sh to execute shell scripts on windows As suggested by dho, iant2. R=golang-dev, rsc CC=devon.odell, golang-dev, iant https://golang.org/cl/4515147 --- src/pkg/exec/exec_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/pkg/exec/exec_test.go') diff --git a/src/pkg/exec/exec_test.go b/src/pkg/exec/exec_test.go index eb8cd5fec9..362b41c013 100644 --- a/src/pkg/exec/exec_test.go +++ b/src/pkg/exec/exec_test.go @@ -39,7 +39,7 @@ func TestRunCat(t *testing.T) { } func TestRunEcho(t *testing.T) { - cmd, err := run([]string{"sh", "-c", "echo hello world"}, + cmd, err := run([]string{"bash", "-c", "echo hello world"}, DevNull, Pipe, DevNull) if err != nil { t.Fatal("run:", err) @@ -57,7 +57,7 @@ func TestRunEcho(t *testing.T) { } func TestStderr(t *testing.T) { - cmd, err := run([]string{"sh", "-c", "echo hello world 1>&2"}, + cmd, err := run([]string{"bash", "-c", "echo hello world 1>&2"}, DevNull, DevNull, Pipe) if err != nil { t.Fatal("run:", err) @@ -75,7 +75,7 @@ func TestStderr(t *testing.T) { } func TestMergeWithStdout(t *testing.T) { - cmd, err := run([]string{"sh", "-c", "echo hello world 1>&2"}, + cmd, err := run([]string{"bash", "-c", "echo hello world 1>&2"}, DevNull, Pipe, MergeWithStdout) if err != nil { t.Fatal("run:", err) @@ -97,7 +97,7 @@ func TestAddEnvVar(t *testing.T) { if err != nil { t.Fatal("setenv:", err) } - cmd, err := run([]string{"sh", "-c", "echo $NEWVAR"}, + cmd, err := run([]string{"bash", "-c", "echo $NEWVAR"}, DevNull, Pipe, DevNull) if err != nil { t.Fatal("run:", err) -- cgit v1.3