diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-25 05:57:54 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-05-25 05:57:54 +0000 |
| commit | 33317c39a26fddca642084ecf351055dc5364e5a (patch) | |
| tree | 2df8ea796e40a6a85d640f1ac67e5f18a4172c9a /libgo | |
| parent | a977d63f5ca29e8dc13221f30822f2065b94aadc (diff) | |
| download | gcc-33317c39a26fddca642084ecf351055dc5364e5a.tar.gz | |
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
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 8b8a8434970..8df69626113 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) } |