[glib/wip/smcv/fileutils-test-as-root: 1/2] glib/tests/fileutils: Make more use of g_assert_no_errno()
- From: Simon McVittie <smcv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/smcv/fileutils-test-as-root: 1/2] glib/tests/fileutils: Make more use of g_assert_no_errno()
- Date: Wed, 28 Oct 2020 12:28:48 +0000 (UTC)
commit f4d7522f95f9be6deb5eba75b4f4b43c1cb7ce14
Author: Simon McVittie <smcv collabora com>
Date: Wed Oct 28 12:21:16 2020 +0000
glib/tests/fileutils: Make more use of g_assert_no_errno()
Signed-off-by: Simon McVittie <smcv collabora com>
glib/tests/fileutils.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c
index fa6fc6acf..cfcf0e40d 100644
--- a/glib/tests/fileutils.c
+++ b/glib/tests/fileutils.c
@@ -557,13 +557,13 @@ check_cap_dac_override (const char *tmpdir)
dac_denies_write = g_build_filename (tmpdir, "dac-denies-write", 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_cmpint (chmod (dac_denies_write, 0) == 0 ? 0 : errno, ==, 0);
+ g_assert_no_errno (mkdir (dac_denies_write, S_IRWXU));
+ g_assert_no_errno (chmod (dac_denies_write, 0));
if (mkdir (inside, S_IRWXU) == 0)
{
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;
}
else
@@ -575,8 +575,8 @@ check_cap_dac_override (const char *tmpdir)
have_cap = FALSE;
}
- g_assert_cmpint (chmod (dac_denies_write, S_IRWXU) == 0 ? 0 : errno, ==, 0);
- g_assert_cmpint (rmdir (dac_denies_write) == 0 ? 0 : errno, ==, 0);
+ g_assert_no_errno (chmod (dac_denies_write, S_IRWXU));
+ g_assert_no_errno (rmdir (dac_denies_write));
g_free (dac_denies_write);
g_free (inside);
return have_cap;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]