[mutter/wip/lantw/tests-wayland-Don't-test-file-sealing-on-the-fallback-case] tests/wayland: Don't test file sealing on the fallback case



commit 1c5716247b93865cfdf08df84a8e1200ec5bd6b7
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sun May 3 23:35:38 2020 +0800

    tests/wayland: Don't test file sealing on the fallback case
    
    When memfd_create isn't used, the file isn't sealed. Therefore, we
    should skip test_readonly_seals on the fallback case. This fixes
    compilation error on FreeBSD 12, which does not support memfd_create.
    
    https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1229

 src/tests/wayland-test-clients/meta-anonymous-file.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/tests/wayland-test-clients/meta-anonymous-file.c 
b/src/tests/wayland-test-clients/meta-anonymous-file.c
index 4bf0e2ee3..70f739866 100644
--- a/src/tests/wayland-test-clients/meta-anonymous-file.c
+++ b/src/tests/wayland-test-clients/meta-anonymous-file.c
@@ -27,7 +27,9 @@
 
 #include "wayland-test-client-utils.h"
 
+#if defined(HAVE_MEMFD_CREATE)
 #define READONLY_SEALS (F_SEAL_SHRINK | F_SEAL_GROW | F_SEAL_WRITE)
+#endif
 
 static const char *teststring = "test string 1234567890";
 
@@ -67,6 +69,7 @@ test_write_fd (int         fd,
   return TRUE;
 }
 
+#if defined(HAVE_MEMFD_CREATE)
 static int
 test_readonly_seals (int fd)
 {
@@ -81,6 +84,7 @@ test_readonly_seals (int fd)
 
   return TRUE;
 }
+#endif
 
 static int
 test_write_read (int fd)
@@ -224,9 +228,6 @@ main (int    argc,
   other_fd = meta_anonymous_file_open_fd (file, META_ANONYMOUS_FILE_MAPMODE_PRIVATE);
   g_assert (other_fd != -1);
 
-  if (test_readonly_seals (fd))
-    goto fail;
-
   /* Writing and reading the written data should succeed */
   if (!test_write_read (fd))
     goto fail;
@@ -244,9 +245,6 @@ main (int    argc,
   other_fd = meta_anonymous_file_open_fd (file, META_ANONYMOUS_FILE_MAPMODE_SHARED);
   g_assert (other_fd != -1);
 
-  if (test_readonly_seals (fd))
-    goto fail;
-
   if (!test_read_fd_mmap (fd, teststring))
     goto fail;
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]