summaryrefslogtreecommitdiff
path: root/tests/cp
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-04-20 23:29:19 +0200
committerJim Meyering <meyering@redhat.com>2008-04-21 00:02:00 +0200
commit90bc2fe272debe8540a59b9a1e565c43e87e4635 (patch)
tree83a9f9df5273d37130d64cd707e87d75b902284c /tests/cp
parentc51900a6bd655e7dd596fa6888a0e521e6b5a6bd (diff)
downloadcoreutils-90bc2fe272debe8540a59b9a1e565c43e87e4635.tar.xz
tests: convert umask-check to a function
* tests/test-lib.sh (working_umask_or_skip_): New function, from... * tests/umask-check: ...here. Remove file. * tests/Makefile.am (EXTRA_DIST): Remove umask-check. * tests/mkdir/perm: Use the function rather than sourcing the file. * tests/cp/cp-parents: Likewise. * tests/cp/parent-perm: Likewise. Bruno Haible reported that parent-perm was failing to run umask-check.
Diffstat (limited to 'tests/cp')
-rwxr-xr-xtests/cp/cp-parents3
-rwxr-xr-xtests/cp/parent-perm2
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents
index fe62f2b15..5b3913a7f 100755
--- a/tests/cp/cp-parents
+++ b/tests/cp/cp-parents
@@ -23,9 +23,10 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/umask-check
. $top_srcdir/tests/test-lib.sh
+working_umask_or_skip_
+
# Run the setgid check from the just-created directory.
. "$abs_top_srcdir/tests/setgid-check"
diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
index bca0f8769..d2c2533cc 100755
--- a/tests/cp/parent-perm
+++ b/tests/cp/parent-perm
@@ -24,7 +24,7 @@ fi
. $top_srcdir/tests/envvar-check
. $top_srcdir/tests/test-lib.sh
-. $abs_srcdir/../umask-check
+working_umask_or_skip_
mkdir -p a/b/c a/b/d e || framework_failure
touch a/b/c/foo a/b/d/foo || framework_failure