diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-05-25 05:57:54 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-05-25 05:57:54 +0000 |
| commit | 349ea8e8550b73e69673f629df24d79902b4d371 (patch) | |
| tree | 2df8ea796e40a6a85d640f1ac67e5f18a4172c9a /libgo | |
| parent | 30a435d83ab076958e210c724f090d0c6a27781a (diff) | |
| download | gcc-349ea8e8550b73e69673f629df24d79902b4d371.zip gcc-349ea8e8550b73e69673f629df24d79902b4d371.tar.gz gcc-349ea8e8550b73e69673f629df24d79902b4d371.tar.bz2 | |
re PR go/48502 (os_test.TestStartProcess FAILs on Solaris 2)
PR go/48502
libgo/os: Fix test to run on Solaris.
Patch brought over from upstream library.
From-SVN: r174167
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/os/os_test.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libgo/go/os/os_test.go b/libgo/go/os/os_test.go index 8b8a843..8df6962 100644 --- a/libgo/go/os/os_test.go +++ b/libgo/go/os/os_test.go @@ -437,7 +437,8 @@ func exec(t *testing.T, dir, cmd string, args []string, expect string) { var b bytes.Buffer io.Copy(&b, r) output := b.String() - if output != expect { + // Accept /usr prefix because Solaris /bin is symlinked to /usr/bin. + if output != expect && output != "/usr"+expect { t.Errorf("exec %q returned %q wanted %q", strings.Join(append([]string{cmd}, args...), " "), output, expect) } |