Skip to content

Commit

Permalink
tst-fanotify: skip when we get back EPERM
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Frysinger committed Sep 5, 2013
1 parent 2deb7bd commit bb8ea71
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 8 additions & 5 deletions sysdeps/unix/sysv/linux/tst-fanotify.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bb8ea71

Please sign in to comment.