diff options
Diffstat (limited to 'libgo/go/exec/exec_test.go')
| -rw-r--r-- | libgo/go/exec/exec_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libgo/go/exec/exec_test.go b/libgo/go/exec/exec_test.go index 2b36e2535a4..6d5e8933ff7 100644 --- a/libgo/go/exec/exec_test.go +++ b/libgo/go/exec/exec_test.go @@ -53,8 +53,8 @@ func TestCatStdin(t *testing.T) { func TestCatGoodAndBadFile(t *testing.T) { // Testing combined output and error values. bs, err := helperCommand("cat", "/bogus/file.foo", "exec_test.go").CombinedOutput() - if _, ok := err.(*os.Waitmsg); !ok { - t.Errorf("expected Waitmsg from cat combined; got %T: %v", err, err) + if _, ok := err.(*ExitError); !ok { + t.Errorf("expected *ExitError from cat combined; got %T: %v", err, err) } s := string(bs) sp := strings.SplitN(s, "\n", 2) @@ -81,17 +81,17 @@ func TestNoExistBinary(t *testing.T) { func TestExitStatus(t *testing.T) { // Test that exit values are returned correctly err := helperCommand("exit", "42").Run() - if werr, ok := err.(*os.Waitmsg); ok { - if s, e := werr.String(), "exit status 42"; s != e { + if werr, ok := err.(*ExitError); ok { + if s, e := werr.Error(), "exit status 42"; s != e { t.Errorf("from exit 42 got exit %q, want %q", s, e) } } else { - t.Fatalf("expected Waitmsg from exit 42; got %T: %v", err, err) + t.Fatalf("expected *ExitError from exit 42; got %T: %v", err, err) } } func TestPipes(t *testing.T) { - check := func(what string, err os.Error) { + check := func(what string, err error) { if err != nil { t.Fatalf("%s: %v", what, err) } @@ -224,7 +224,7 @@ func TestHelperProcess(*testing.T) { bufr := bufio.NewReader(os.Stdin) for { line, _, err := bufr.ReadLine() - if err == os.EOF { + if err == io.EOF { break } else if err != nil { os.Exit(1) |