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"
. $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
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,.*/,,'; }
+++ /dev/null
-# -*- sh -*-
-# Disable the current test if umask doesn't work as usual.
-
-# Copyright (C) 2005, 2007 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>. */
-
-# This test should be run in the temporary directory that ends
-# up being removed via the trap commands.
-
-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