From 90bc2fe272debe8540a59b9a1e565c43e87e4635 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sun, 20 Apr 2008 23:29:19 +0200
Subject: 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.
---
 tests/cp/cp-parents  | 3 ++-
 tests/cp/parent-perm | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'tests/cp')

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
-- 
cgit v1.2.3-70-g09d2