From 67772b6a70ae9124cf16ee0db9880987a3c58a23 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Fri, 27 Sep 2019 17:43:29 +0100
Subject: [PATCH] tests: Unconditionally enable the file permissions test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Skip it on systems which don’t support it, rather than compiling it out.
That gives us more information from test runs about which tests are
being run on which architectures.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 gio/tests/file.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gio/tests/file.c b/gio/tests/file.c
index efb2eaadd..ec3f18027 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -846,10 +846,10 @@ test_async_delete (void)
   g_object_unref (file);
 }
 
-#ifdef G_OS_UNIX
 static void
 test_copy_preserve_mode (void)
 {
+#ifdef G_OS_UNIX
   GFile *tmpfile;
   GFile *dest_tmpfile;
   GFileInfo *dest_info;
@@ -896,8 +896,10 @@ test_copy_preserve_mode (void)
   g_clear_object (&tmpfile);
   g_clear_object (&dest_tmpfile);
   g_clear_object (&dest_info);
-}
+#else  /* if !G_OS_UNIX */
+  g_test_skip ("File permissions tests can only be run on Unix")
 #endif
+}
 
 static gchar *
 splice_to_string (GInputStream   *stream,
@@ -1755,9 +1757,7 @@ main (int argc, char *argv[])
   g_test_add_func ("/file/replace-load", test_replace_load);
   g_test_add_func ("/file/replace-cancel", test_replace_cancel);
   g_test_add_func ("/file/async-delete", test_async_delete);
-#ifdef G_OS_UNIX
   g_test_add_func ("/file/copy-preserve-mode", test_copy_preserve_mode);
-#endif
   g_test_add_func ("/file/measure", test_measure);
   g_test_add_func ("/file/measure-async", test_measure_async);
   g_test_add_func ("/file/load-bytes", test_load_bytes);