Removing now-redundant path-size check from send_if_directory().

[rsync/rsync.git] / testsuite / chmod-temp-dir.test

diff --git a/testsuite/chmod-temp-dir.test b/testsuite/chmod-temp-dir.test
index 5fda2b1..bce544c 100644 (file)
--- a/testsuite/chmod-temp-dir.test
+++ b/testsuite/chmod-temp-dir.test
@@ -2,7 +2,7 @@
 
 # Copyright (C) 2004 by Wayne Davison <wayned@samba.org>
 
-# This program is distributable under the terms of the GNU GPL see
+# This program is distributable under the terms of the GNU GPL (see
 # COPYING).
 
 # Test that various read-only and set[ug]id permissions work properly,
@@ -11,16 +11,21 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 hands_setup
 
-tmpdir2=/tmp
+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
-    tdev=`$TOOLDIR/getfsdev $tmpdir2`
+    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