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>

diff --git a/tests/cp/acl b/tests/cp/acl
index fd6e86d..05b4ec6 100755 (executable)
--- 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 14be686..8f9d565 100755 (executable)
--- 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"