/bin is a directory on Solaris 2, which causes the libgo os test to
fail:

FAIL: os
--- FAIL: os_test.TestChdirAndGetwd
        Getwd returned "/usr/bin" want "/bin"

This patch fixes this by simply removing /bin.  One could probably
replace it by /sbin instead, which is a directory on every Unix I know.

        Rainer


2011-03-05  Rainer Orth  <r...@cebitec.uni-bielefeld.de>

        * go/os/os_test.go (TestChdirAndGetwd): Remove /bin from dirs.

diff -r 805097eb6ad2 libgo/go/os/os_test.go
--- a/libgo/go/os/os_test.go    Sat Mar 05 23:32:32 2011 +0100
+++ b/libgo/go/os/os_test.go    Sat Mar 05 23:39:00 2011 +0100
@@ -1,4 +1,4 @@
-// Copyright 2009 The Go Authors. All rights reserved.
+// Copyright 2009, 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -609,7 +609,7 @@
        }
        // These are chosen carefully not to be symlinks on a Mac
        // (unlike, say, /var, /etc, and /tmp).
-       dirs := []string{"/bin", "/", "/usr/bin"}
+       dirs := []string{"/", "/usr/bin"}
        for mode := 0; mode < 2; mode++ {
                for _, d := range dirs {
                        if mode == 0 {


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

Reply via email to