From: Brad Fitzpatrick <bradfitz@golang.org>
Date: Tue, 8 Mar 2016 15:58:20 +0000 (+0000)
Subject: os/user: skip Current test on android
X-Git-Tag: go1.7beta1~1483
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b20187196f2674c736bb89d9dde741c93bec3255;p=gostls13.git

os/user: skip Current test on android

Also, add more failure output to debug why linux/mips64le and
linux/ppc64 are failing. They should be working. I suspect their
builder test envs are missing something.

Change-Id: I97273fe72c4e3009db400394636d0da1ef147485
Reviewed-on: https://go-review.googlesource.com/20358
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Hyang-Ah Hana Kim <hyangah@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/os/user/lookup_stubs.go b/src/os/user/lookup_stubs.go
index 7ff4829516..ebf24f79de 100644
--- a/src/os/user/lookup_stubs.go
+++ b/src/os/user/lookup_stubs.go
@@ -43,7 +43,7 @@ func current() (*User, error) {
 	if u.Uid != "" && u.Username != "" && u.HomeDir != "" {
 		return u, nil
 	}
-	return nil, fmt.Errorf("user: Current not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
+	return u, fmt.Errorf("user: Current not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
 }
 
 func lookupUser(username string) (*User, error) {
diff --git a/src/os/user/user_test.go b/src/os/user/user_test.go
index 122051d959..222b339544 100644
--- a/src/os/user/user_test.go
+++ b/src/os/user/user_test.go
@@ -16,9 +16,12 @@ func checkUser(t *testing.T) {
 }
 
 func TestCurrent(t *testing.T) {
+	if runtime.GOOS == "android" {
+		t.Skipf("skipping on %s", runtime.GOOS)
+	}
 	u, err := Current()
 	if err != nil {
-		t.Fatalf("Current: %v", err)
+		t.Fatalf("Current: %v (got %#v)", err, u)
 	}
 	if u.HomeDir == "" {
 		t.Errorf("didn't get a HomeDir")