diff options
| -rwxr-xr-x | tests/rm/inaccessible | 8 | ||||
| -rw-r--r-- | tests/test-lib.sh | 15 |
2 files changed, 16 insertions, 7 deletions
diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible index 314a3de6f..f40a342d0 100755 --- a/tests/rm/inaccessible +++ b/tests/rm/inaccessible @@ -26,13 +26,7 @@ fi # Skip this test if your system has neither the openat-style functions # nor /proc/self/fd support with which to emulate them. -skip=yes -grep '^#define HAVE_OPENAT' $CONFIG_HEADER > /dev/null && skip=no -test -d /proc/self/fd && skip=no -if test $skip = yes; then - skip_test_ 'this system lacks openat support' -fi - +require_openat_support_ skip_if_root_ p=`pwd` diff --git a/tests/test-lib.sh b/tests/test-lib.sh index 9797b552e..1174d980b 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -47,6 +47,21 @@ require_acl_() || skip_test_ "This test requires a local user named bin." } +require_openat_support_() +{ + # Skip this test if your system has neither the openat-style functions + # nor /proc/self/fd support with which to emulate them. + test -z "$CONFIG_HEADER" \ + && skip_test_ 'internal error: CONFIG_HEADER not defined' + + _skip=yes + grep '^#define HAVE_OPENAT' "$CONFIG_HEADER" > /dev/null && _skip=no + test -d /proc/self/fd && _skip=no + if test $_skip = yes; then + skip_test_ 'this system lacks openat support' + fi +} + require_ulimit_() { ulimit_works=yes |