From 5d3a31dfc76cf6652e779ed03c89b85718d37ebb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 10 Feb 2023 13:46:22 +0100 Subject: [PATCH] chown, lchown, fchownat tests: Avoid test failure on macOS 12. * tests/test-chown.h (test_chown): Skip some assertions if getgid() == (gid_t)-1. * tests/test-lchown.h (test_lchown): Likewise. --- ChangeLog | 7 +++++++ tests/test-chown.h | 11 ++++++++--- tests/test-lchown.h | 14 ++++++++++---- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bd0de57ad5..522309afa1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-02-10 Bruno Haible + + chown, lchown, fchownat tests: Avoid test failure on macOS 12. + * tests/test-chown.h (test_chown): Skip some assertions if + getgid() == (gid_t)-1. + * tests/test-lchown.h (test_lchown): Likewise. + 2023-02-09 Bruno Haible math: Fix compilation error in C++ mode on macOS 12.5. diff --git a/tests/test-chown.h b/tests/test-chown.h index e8c3d49ff9..4c7b6eec33 100644 --- a/tests/test-chown.h +++ b/tests/test-chown.h @@ -72,7 +72,10 @@ test_chown (int (*func) (char const *, uid_t, gid_t), bool print) ASSERT (stat (BASE "dir/file", &st1) == 0); ASSERT (st1.st_uid != (uid_t) -1); ASSERT (st1.st_gid != (gid_t) -1); - ASSERT (st1.st_gid == getegid ()); + /* On macOS 12, when logged in through ssh, getgid () and getegid () are both + == (gid_t) -1. */ + if (getgid () != (gid_t) -1) + ASSERT (st1.st_gid == getegid ()); /* Sanity check of error cases. */ errno = 0; @@ -132,7 +135,8 @@ test_chown (int (*func) (char const *, uid_t, gid_t), bool print) if (1 < gids_count) { ASSERT (gids[1] != st1.st_gid); - ASSERT (gids[1] != (gid_t) -1); + if (getgid () != (gid_t) -1) + ASSERT (gids[1] != (gid_t) -1); ASSERT (lstat (BASE "dir/link", &st2) == 0); ASSERT (st1.st_uid == st2.st_uid); ASSERT (st1.st_gid == st2.st_gid); @@ -156,7 +160,8 @@ test_chown (int (*func) (char const *, uid_t, gid_t), bool print) ASSERT (func (BASE "dir/link2", -1, gids[1]) == 0); ASSERT (stat (BASE "dir/file", &st2) == 0); ASSERT (st1.st_uid == st2.st_uid); - ASSERT (gids[1] == st2.st_gid); + if (getgid () != (gid_t) -1) + ASSERT (gids[1] == st2.st_gid); ASSERT (lstat (BASE "dir/link", &st2) == 0); ASSERT (st1.st_uid == st2.st_uid); ASSERT (st1.st_gid == st2.st_gid); diff --git a/tests/test-lchown.h b/tests/test-lchown.h index 1e5dffef7f..1c68f4a1ba 100644 --- a/tests/test-lchown.h +++ b/tests/test-lchown.h @@ -80,7 +80,10 @@ test_lchown (int (*func) (char const *, uid_t, gid_t), bool print) ASSERT (stat (BASE "dir/file", &st1) == 0); ASSERT (st1.st_uid != (uid_t) -1); ASSERT (st1.st_gid != (gid_t) -1); - ASSERT (st1.st_gid == getegid ()); + /* On macOS 12, when logged in through ssh, getgid () and getegid () are both + == (gid_t) -1. */ + if (getgid () != (gid_t) -1) + ASSERT (st1.st_gid == getegid ()); /* Sanity check of error cases. */ errno = 0; @@ -150,7 +153,8 @@ test_lchown (int (*func) (char const *, uid_t, gid_t), bool print) if (1 < gids_count) { ASSERT (gids[1] != st1.st_gid); - ASSERT (gids[1] != (gid_t) -1); + if (getgid () != (gid_t) -1) + ASSERT (gids[1] != (gid_t) -1); ASSERT (lstat (BASE "dir/link", &st2) == 0); ASSERT (st1.st_uid == st2.st_uid); ASSERT (st1.st_gid == st2.st_gid); @@ -180,7 +184,8 @@ test_lchown (int (*func) (char const *, uid_t, gid_t), bool print) ASSERT (st1.st_gid == st2.st_gid); ASSERT (lstat (BASE "dir/link2", &st2) == 0); ASSERT (st1.st_uid == st2.st_uid); - ASSERT (gids[1] == st2.st_gid); + if (getgid () != (gid_t) -1) + ASSERT (gids[1] == st2.st_gid); /* Trailing slash follows through to directory. */ ASSERT (lstat (BASE "dir/link3", &st2) == 0); @@ -196,7 +201,8 @@ test_lchown (int (*func) (char const *, uid_t, gid_t), bool print) ASSERT (st1.st_gid == st2.st_gid); ASSERT (lstat (BASE "dir/sub", &st2) == 0); ASSERT (st1.st_uid == st2.st_uid); - ASSERT (gids[1] == st2.st_gid); + if (getgid () != (gid_t) -1) + ASSERT (gids[1] == st2.st_gid); } else if (!CHOWN_CHANGE_TIME_BUG || HAVE_LCHMOD) { -- 2.39.5