diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/os/user/user_test.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 0203eee..a1bcb4b 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -7e590184ae1ebc02e1b2577de00cf4fe842217dc +208521930c9b5adcfb495799ee01b6aec86c2ccf The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/os/user/user_test.go b/libgo/go/os/user/user_test.go index 2563077..eeb24dd 100644 --- a/libgo/go/os/user/user_test.go +++ b/libgo/go/os/user/user_test.go @@ -129,6 +129,9 @@ func TestLookupGroup(t *testing.T) { func TestGroupIds(t *testing.T) { checkGroup(t) + if runtime.GOOS == "aix" { + t.Skip("skipping GroupIds, see golang.org/issue/30563") + } if runtime.GOOS == "solaris" { t.Skip("skipping GroupIds, see golang.org/issue/14709") } |