PR go/48502

libgo/os: Fix test to run on Solaris.

Patch brought over from upstream library.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174167 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libgo/go/os/os_test.go b/libgo/go/os/os_test.go
index 8b8a843..8df6962 100644 (file)
--- 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)
        }