From 4335e69af64b96cd69fa876c5157d6caebde23a6 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 21 Feb 2013 14:00:03 -0800 Subject: [PATCH] archive/tar: make test pass on setgid dirs Fixes #4867 R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/7382045 --- src/pkg/archive/tar/tar_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pkg/archive/tar/tar_test.go b/src/pkg/archive/tar/tar_test.go index 7d88716de8..b55cc2c613 100644 --- a/src/pkg/archive/tar/tar_test.go +++ b/src/pkg/archive/tar/tar_test.go @@ -48,7 +48,8 @@ func TestFileInfoHeaderDir(t *testing.T) { if g, e := h.Name, "testdata/"; g != e { t.Errorf("Name = %q; want %q", g, e) } - if g, e := h.Mode, int64(fi.Mode().Perm())|c_ISDIR; g != e { + const setsid = 02000 // see golang.org/issue/4867 + if g, e := h.Mode&^setsid, int64(fi.Mode().Perm())|c_ISDIR; g != e { t.Errorf("Mode = %#o; want %#o", g, e) } if g, e := h.Size, int64(0); g != e { -- 2.48.1