[glib/wip/iainl/fix-1934: 2/2] test_copy_preserve_mode: Adjust for the previous revert

[Iain Lane <iainl src gnome org>]

commit 0c88825a75f88abb64b151aed6fbb880ad0f3675
Author: Iain Lane <iainl gnome org>
Date:   Thu Nov 21 10:33:43 2019 +0000

    test_copy_preserve_mode: Adjust for the previous revert
    
    Now we're returning the file type again, we need to mask it out to
    compare with the mode. We can also check that the statbuf said the file
    is a regular file.
    
    Related: #1934

 gio/tests/file.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gio/tests/file.c b/gio/tests/file.c
index 33dc50aa6..8d3aafa63 100644
--- a/gio/tests/file.c
+++ b/gio/tests/file.c
@@ -929,7 +929,8 @@ test_copy_preserve_mode (void)
 
       dest_mode = g_file_info_get_attribute_uint32 (dest_info, G_FILE_ATTRIBUTE_UNIX_MODE);
 
-      g_assert_cmpint (dest_mode, ==, vectors[i].expected_destination_mode);
+      g_assert_cmpint (dest_mode & ~S_IFMT, ==, vectors[i].expected_destination_mode);
+      g_assert_cmpint (dest_mode & S_IFMT, ==, S_IFREG);
 
       (void) g_file_delete (tmpfile, NULL, NULL);
       (void) g_file_delete (dest_tmpfile, NULL, NULL);