From b7ffc07d9893949b218d4057d896e7ba943c1b8b Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 8 May 2017 11:19:46 +0100 Subject: [PATCH] tests: Improve error handling for fileutils test The test_stdio_wrappers() test will spuriously fail if the mkdir-test directory already exists and is non-empty, which can happen if a previous test run has failed and left a coredump file in the directory. Tighten up the error checking around the pre-test rmdir() call to catch this failure. Signed-off-by: Philip Withnall https://bugzilla.gnome.org/show_bug.cgi?id=782237 --- glib/tests/fileutils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c index 10ef13663..4c987a3ad 100644 --- a/glib/tests/fileutils.c +++ b/glib/tests/fileutils.c @@ -848,7 +848,8 @@ test_stdio_wrappers (void) GError *error = NULL; g_remove ("mkdir-test/test-create"); - g_rmdir ("mkdir-test"); + ret = g_rmdir ("mkdir-test"); + g_assert (ret == 0 || errno == ENOENT); ret = g_stat ("mkdir-test", &buf); g_assert_cmpint (ret, ==, -1);