luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-31 08:22:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib/tests/fileutils: Make more use of g_assert_no_errno()

Browse Source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2020-10-28 12:21:16 +00:00
parent b04a359d1e
commit c63da52bec
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glib/tests/fileutils.c
View File

@@ -557,13 +557,13 @@ check_cap_dac_override (const char *tmpdir)
dac_denies_write = g_build_filename (tmpdir, "dac-denies-write", NULL); dac_denies_write = g_build_filename (tmpdir, "dac-denies-write", NULL);
inside = g_build_filename (dac_denies_write, "inside", NULL); inside = g_build_filename (dac_denies_write, "inside", NULL);
g_assert_cmpint (mkdir (dac_denies_write, S_IRWXU) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (mkdir (dac_denies_write, S_IRWXU));
g_assert_cmpint (chmod (dac_denies_write, 0) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (chmod (dac_denies_write, 0));
if (mkdir (inside, S_IRWXU) == 0) if (mkdir (inside, S_IRWXU) == 0)
{ {
g_test_message ("Looks like we have CAP_DAC_OVERRIDE or equivalent"); g_test_message ("Looks like we have CAP_DAC_OVERRIDE or equivalent");
g_assert_cmpint (rmdir (inside) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (rmdir (inside));
have_cap = TRUE; have_cap = TRUE;
} }
else else
@@ -575,8 +575,8 @@ check_cap_dac_override (const char *tmpdir)
have_cap = FALSE; have_cap = FALSE;
} }
g_assert_cmpint (chmod (dac_denies_write, S_IRWXU) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (chmod (dac_denies_write, S_IRWXU));
g_assert_cmpint (rmdir (dac_denies_write) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (rmdir (dac_denies_write));
g_free (dac_denies_write); g_free (dac_denies_write);
g_free (inside); g_free (inside);
return have_cap; return have_cap;
@@ -606,8 +606,8 @@ test_mkdir_with_parents_permission (void)
subdir = g_build_filename (tmpdir, "sub", NULL); subdir = g_build_filename (tmpdir, "sub", NULL);
subdir2 = g_build_filename (subdir, "sub2", NULL); subdir2 = g_build_filename (subdir, "sub2", NULL);
subdir3 = g_build_filename (subdir2, "sub3", NULL); subdir3 = g_build_filename (subdir2, "sub3", NULL);
g_assert_cmpint (g_mkdir (subdir, 0700) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (g_mkdir (subdir, 0700));
g_assert_cmpint (g_chmod (subdir, 0) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (g_chmod (subdir, 0));
if (have_cap_dac_override) if (have_cap_dac_override)
{ {
@@ -625,11 +625,11 @@ test_mkdir_with_parents_permission (void)
g_assert_cmpint (result, ==, -1); g_assert_cmpint (result, ==, -1);
g_assert_cmpint (saved_errno, ==, EACCES); g_assert_cmpint (saved_errno, ==, EACCES);
g_assert_cmpint (g_chmod (subdir, 0700) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (g_chmod (subdir, 0700));
} }
g_assert_cmpint (g_remove (subdir) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (g_remove (subdir));
g_assert_cmpint (g_remove (tmpdir) == 0 ? 0 : errno, ==, 0); g_assert_no_errno (g_remove (tmpdir));
g_free (subdir3); g_free (subdir3);
g_free (subdir2); g_free (subdir2);
g_free (subdir); g_free (subdir);