--- embedaddon/rsync/testsuite/chmod-temp-dir.test 2012/02/17 15:09:30 1.1.1.1 +++ embedaddon/rsync/testsuite/chmod-temp-dir.test 2021/03/17 00:32:36 1.1.1.2 @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2004 by Wayne Davison +# Copyright (C) 2004-2020 Wayne Davison # This program is distributable under the terms of the GNU GPL (see # COPYING). @@ -13,21 +13,16 @@ hands_setup -tmpdir2=$RSYNC_TEST_TMP -if [ x"$tmpdir2" = x ]; then - tmpdir2=/tmp -fi sdev=`$TOOLDIR/getfsdev $scratchdir` -tdev=`$TOOLDIR/getfsdev $tmpdir2` -if [ x$sdev = x$tdev ]; then - tmpdir2=/var/tmp - if [ -d $tmpdir2 ]; then - tdev=`$TOOLDIR/getfsdev $tmpdir2` - else - tdev="$sdev" - fi - [ x$sdev = x$tdev ] && test_skipped "Can't find a tmp dir on a different file system" -fi +tdev=$sdev + +for tmpdir2 in "${RSYNC_TEST_TMP:-/override-tmp-not-specified}" /run/shm /var/tmp /tmp; do + [ -d "$tmpdir2" -a -w "$tmpdir2" ] || continue + tdev=`$TOOLDIR/getfsdev "$tmpdir2"` + [ x$sdev != x$tdev ] && break +done + +[ x$sdev = x$tdev ] && test_skipped "Can't find a tmp dir on a different file system" chmod 440 "$fromdir/text" chmod 500 "$fromdir/dir/text"