qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-24 20:00:10 -07:00
Code Releases Activity

os: Fix test to work on Solaris.

Browse Source 
On Solaris /bin is a symlink to /usr/bin, so running "pwd" in
the directory "/bin" prints out "/usr/bin".

R=rsc, r, bradfitz
CC=golang-dev
https://golang.org/cl/4559043
This commit is contained in:
Ian Lance Taylor 2011-05-24 22:53:37 -07:00
parent c4918db8b9
commit ddcdbd4470
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pkg/os/os_test.go
View File

@ -442,7 +442,8 @@ func exec(t *testing.T, dir, cmd string, args []string, expect string) {
var b bytes.Buffer var b bytes.Buffer
io.Copy(&b, r) io.Copy(&b, r)
output := b.String() 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", t.Errorf("exec %q returned %q wanted %q",
strings.Join(append([]string{cmd}, args...), " "), output, expect) strings.Join(append([]string{cmd}, args...), " "), output, expect)
} }