Patchwork [libgo] Omit /bin in os_test.go

login
register
mail settings
Submitter Rainer Orth
Date March 7, 2011, 11:10 a.m.
Message ID <yddr5ajw5ie.fsf@manam.CeBiTec.Uni-Bielefeld.DE>
Download mbox | patch
Permalink /patch/85726/
State New
Headers show

Comments

Rainer Orth - March 7, 2011, 11:10 a.m.
/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  <ro@CeBiTec.Uni-Bielefeld.DE>

	* go/os/os_test.go (TestChdirAndGetwd): Remove /bin from dirs.
Ian Taylor - March 7, 2011, 11:37 p.m.
Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> writes:

> /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.

Committed to master repository and gccgo repository.

Thanks.

Ian

Patch

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 {