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/test-lib.sh | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'tests/test-lib.sh')

diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index 80621bb5f..8f56ab105 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -173,6 +173,23 @@ mkfifo_or_skip_()
   fi
 }
 
+# Skip the current test if umask doesn't work as usual.
+# This test should be run in the temporary directory that ends
+# up being removed via the trap commands.
+working_umask_or_skip_()
+{
+  umask 022
+  touch file1 file2
+  chmod 644 file2
+  perms=`ls -l file1 file2 | sed 's/ .*//' | uniq`
+  rm -f file1 file2
+
+  case $perms in
+  *'
+  '*) skip_test_ 'your build directory has unusual umask semantics'
+  esac
+}
+
 test_dir_=$(pwd)
 
 this_test_() { echo "./$0" | sed 's,.*/,,'; }
-- 
cgit v1.2.3-54-g00ecf