From: Jim Meyering <meyering@redhat.com>
Date: Wed, 29 Jul 2009 12:59:27 +0000 (+0200)
Subject: tests: new function: require_openat_support_
X-Git-Tag: v7.5~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c06547cadeed50e85b1de661634a39f7321e562c;p=thirdparty%2Fcoreutils.git

tests: new function: require_openat_support_

* tests/rm/inaccessible: Factor out openat-support-detection code...
* tests/test-lib.sh (require_openat_support_): ...into this new function.
---

diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index 314a3de6fe..f40a342d0d 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 9797b552e3..1174d980bc 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