[libgo] Use /usr/bin/pwd in os_test.TestStartProcess on Solaris (PR go/48502)

[libgo] Use /usr/bin/pwd in os_test.TestStartProcess on Solaris (PR go/48502)

[Rainer Orth]

As described in the PR, the go libgo test fails on Solaris since /bin is
a symlink to /usr/bin.  Since there is other OS-specific code in
os_test.go, I'm using the follwing patch to fix this.

With that patch, libgo test results on i386-pc-solaris2.11 are clean.

	Rainer


2011-05-20  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	PR go/48502
	* go/os/os_test.go (TestStartProcess): Use /usr/bin/pwd on Solaris.

diff --git a/libgo/go/os/os_test.go b/libgo/go/os/os_test.go
--- a/libgo/go/os/os_test.go
+++ b/libgo/go/os/os_test.go
@@ -440,7 +440,12 @@ func TestStartProcess(t *testing.T) {
 		args = []string{"/c", "cd"}
 	} else {
 		le = "\n"
-		cmd = "/bin/pwd"
+		// /bin is a symlink to /usr/bin on Solaris.
+		if syscall.OS == "solaris" {
+			cmd = "/usr/bin/pwd"
+		} else {
+			cmd = "/bin/pwd"
+		}
 		dir = "/"
 		args = []string{}
 	}


-- 
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University

Re: [libgo] Use /usr/bin/pwd in os_test.TestStartProcess on Solaris (PR go/48502)

[Ian Lance Taylor]

[-- Attachment #1: Type: text/plain, Size: 446 bytes --]

Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> As described in the PR, the go libgo test fails on Solaris since /bin is
> a symlink to /usr/bin.  Since there is other OS-specific code in
> os_test.go, I'm using the follwing patch to fix this.

I committed this patch instead, to the upstream library and to gccgo.
Let me know if it doesn't work.  Bootstrapped and ran Go testsuite on
x86_64-unknown-linux-gnu.  Committed to mainline.

Ian


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 511 bytes --]

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)
 	}