luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix test_set_contents_full mode check on win32

Browse Source 
Fixes:
GLib:ERROR:../glib/tests/fileutils.c:1348:test_set_contents_full: assertion failed (statbuf.st_mode & ~S_IFMT == tests[i].new_mode): (438 == 420)

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-01-21 13:40:15 +04:00
parent e74d6f4552
commit a4e302f503
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glib/tests/fileutils.c
View File

@ -1345,7 +1345,17 @@ test_set_contents_full (void)
g_assert_no_errno (g_lstat (set_contents_name, &statbuf));
if (tests[i].existing_file == EXISTING_FILE_NONE)
g_assert_cmpint (statbuf.st_mode & ~S_IFMT, ==, tests[i].new_mode);
{
int mode = statbuf.st_mode & ~S_IFMT;
int new_mode = tests[i].new_mode;
#ifdef G_OS_WIN32
/* on windows, group and others perms handling is different */
/* only check the rwx user permissions */
mode &= (_S_IREAD|_S_IWRITE|_S_IEXEC);
new_mode &= (_S_IREAD|_S_IWRITE|_S_IEXEC);
#endif
g_assert_cmpint (mode, ==, new_mode);
}
#ifndef G_OS_WIN32
if (tests[i].existing_file == EXISTING_FILE_SYMLINK)