diff -r f58704837aa1 libgo/go/os/os_test.go
--- a/libgo/go/os/os_test.go	Tue May 24 15:02:48 2011 -0700
+++ b/libgo/go/os/os_test.go	Tue May 24 22:54:38 2011 -0700
@@ -437,7 +437,8 @@
 	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)
 	}