From a5df33bb62e177ef40c84776f2ad08542c396e85 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Fri, 3 Feb 2006 06:15:46 +0000 Subject: [PATCH] Scratch-dir normalization from Matt: turn off any default ACLs (if setfacl is available) and disable any directory setgid bit to avoid confusing some tests. --- runtests.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/runtests.sh b/runtests.sh index fdf51b58..9f0ce85a 100755 --- a/runtests.sh +++ b/runtests.sh @@ -161,6 +161,12 @@ else echo " preserve_scratch=no" fi +# We'll use setfacl if it's around. +if test -f /usr/bin/setfacl || setfacl --help >/dev/null 2>&1 ; then + setfacl=setfacl +else + setfacl=true +fi if [ ! -f "$rsync_bin" ]; then echo "rsync_bin $rsync_bin is not a file" >&2 @@ -195,6 +201,9 @@ export scratchdir suitedir prep_scratch() { [ -d "$scratchdir" ] && rm -rf "$scratchdir" mkdir "$scratchdir" + # Get rid of default ACLs and dir-setgid to avoid confusing some tests. + $setfacl -k "$scratchdir" + chmod g-s "$scratchdir" return 0 } -- 2.34.1