diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-02-12 18:45:54 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-02-12 18:48:14 +0100 |
| commit | 0601086bd8bc923e9a3eb91201428e2a30b43852 (patch) | |
| tree | 5ce65560547965675ac7a022f67a0dfc604052ab | |
| parent | 70a2bd1864aa34fcde4a179f3c5e2db5bed645e3 (diff) | |
| download | coreutils-0601086bd8bc923e9a3eb91201428e2a30b43852.tar.xz | |
Move more test_skip_-using code to follow ". test-lib.sh".
* tests/mv/acl: Likewise.
* tests/cp/acl: Likewise.
Signed-off-by: Jim Meyering <meyering@redhat.com>
| -rwxr-xr-x | tests/cp/acl | 10 | ||||
| -rwxr-xr-x | tests/mv/acl | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/cp/acl b/tests/cp/acl index fd6e86dd0..05b4ec676 100755 --- a/tests/cp/acl +++ b/tests/cp/acl @@ -2,7 +2,7 @@ # copy files/directories across file system boundaries # and make sure acls are preserved appropriately -# Copyright (C) 2005-2007 Free Software Foundation, Inc. +# Copyright (C) 2005-2008 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 @@ -20,10 +20,6 @@ # Make sure we get English translations. . $srcdir/../lang-default -# Skip this test if cp was built without ACL support: -grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && - skip_test_ "insufficient ACL support" - if test "$VERBOSE" = yes; then set -x mv --version @@ -34,6 +30,10 @@ fi . $srcdir/../test-lib.sh require_acl_ +# Skip this test if cp was built without ACL support: +grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && + skip_test_ "insufficient ACL support" + mkdir -p a b || framework_failure touch a/file || framework_failure diff --git a/tests/mv/acl b/tests/mv/acl index 14be68690..8f9d565be 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -2,7 +2,7 @@ # move files/directories across file system boundaries # and make sure acls are preserved -# Copyright (C) 2005-2007 Free Software Foundation, Inc. +# Copyright (C) 2005-2008 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 @@ -17,10 +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/>. -# Skip this test if cp was built without ACL support: -grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && - skip_test_ "insufficient ACL support" - if test "$VERBOSE" = yes; then set -x mv --version @@ -32,6 +28,10 @@ fi . $srcdir/../test-lib.sh require_acl_ +# Skip this test if cp was built without ACL support: +grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && + skip_test_ "insufficient ACL support" + cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" |