tst-fanotify: skip when we get back EPERM

Since fanotify_init requires CAP_SYS_ADMIN in order to work (which usually
means running as root), we need to handle that error case too.

Reported-by: Andreas Jaeger <aj@suse.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 1f291278b6b73cbfe202b48b4d2ad462d631ad75..773ea6a1c6ad6bb529152f73043cbdb5823748a3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-05  Mike Frysinger  <vapier@gentoo.org>
+
+       * sysdeps/unix/sysv/linux/tst-fanotify.c (do_test): Skip test when
+       fanotify_init returns EPERM.
+
 2013-09-04  Joseph Myers  <joseph@codesourcery.com>
 
        * conform/conformtest.pl (newtoken): Treat tokens not allowed as

diff --git a/sysdeps/unix/sysv/linux/tst-fanotify.c b/sysdeps/unix/sysv/linux/tst-fanotify.c
index b88995d6f3d44e09c69fe7361ac9ceeb9a40f8e2..b21e160cadfe1e63be6e606286a3177395b88b53 100644 (file)
--- a/sysdeps/unix/sysv/linux/tst-fanotify.c
+++ b/sysdeps/unix/sysv/linux/tst-fanotify.c
@@ -29,11 +29,14 @@ do_test (void)
   fd = fanotify_init (0, 0);
   if (fd < 0)
     {
-      if (errno == ENOSYS)
-       {
-         puts ("SKIP: missing support for fanotify (check CONFIG_FANOTIFY=y)");
-         return 0;
-       }
+      switch (errno) {
+      case ENOSYS:
+       puts ("SKIP: missing support for fanotify (check CONFIG_FANOTIFY=y)");
+       return 0;
+      case EPERM:
+       puts ("SKIP: missing proper permissions for runtime test");
+       return 0;
+      }
 
       perror ("fanotify_init (0, 0) failed");
       return 1;