diff options
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/acl | 35 | ||||
| -rwxr-xr-x | tests/cp/acl | 2 | ||||
| -rwxr-xr-x | tests/mv/acl | 4 | ||||
| -rw-r--r-- | tests/test-lib.sh | 10 |
5 files changed, 13 insertions, 39 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 25ca50911..d060c5b86 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,7 +12,6 @@ EXTRA_DIST = \ CuTmpdir.pm \ Makefile.am.in \ README \ - acl \ check.mk \ envvar-check \ expensive \ diff --git a/tests/acl b/tests/acl deleted file mode 100644 index 61ddc01ec..000000000 --- a/tests/acl +++ /dev/null @@ -1,35 +0,0 @@ -# Test whether acl tests can be done. - -# Copyright (C) 2005, 2006 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -getfacl --version < /dev/null > /dev/null 2>&1 \ - && setfacl --version < /dev/null > /dev/null 2>&1 || { - cat <<EOF 1>&2 -************************************** -$0: This test requires getfacl and setfacl. -************************************** -EOF - (exit 77); exit 77 -} - -id -u bin > /dev/null 2>&1 || { - cat <<EOF 1>&2 -************************************** -$0: This test requires a local user named bin. -************************************** -EOF - (exit 77); exit 77 -} diff --git a/tests/cp/acl b/tests/cp/acl index d28537890..42f7c3464 100755 --- a/tests/cp/acl +++ b/tests/cp/acl @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. $srcdir/../acl # Make sure we get English translations. . $srcdir/../lang-default @@ -36,6 +35,7 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../test-lib.sh +require_acl_ mkdir -p a b || framework_failure touch a/file || framework_failure diff --git a/tests/mv/acl b/tests/mv/acl index 894397a93..f60f68050 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. $srcdir/../acl - # Skip this test if cp was built without ACL support: grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && \ { @@ -35,6 +33,8 @@ fi . $srcdir/../lang-default . $srcdir/../test-lib.sh +require_acl_ + cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/test-lib.sh b/tests/test-lib.sh index a3afba0bf..cfc386a1a 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -14,6 +14,16 @@ skip_test_() (exit 77); exit 77 } +require_acl_() +{ + getfacl --version < /dev/null > /dev/null 2>&1 \ + && setfacl --version < /dev/null > /dev/null 2>&1 \ + || skip_test_ "This test requires getfacl and setfacl." + + id -u bin > /dev/null 2>&1 \ + || skip_test_ "This test requires a local user named bin." +} + require_ulimit_() { ulimit_works=yes |