Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change naming of local patch-related branches and unify
[rsync/rsync.git]
/
testsuite
/
chmod-temp-dir.test
diff --git
a/testsuite/chmod-temp-dir.test
b/testsuite/chmod-temp-dir.test
index
f17f3cc
..
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>
# 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,
# COPYING).
# Test that various read-only and set[ug]id permissions work properly,
@@
-13,12
+13,19
@@
hands_setup
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
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
[ x$sdev = x$tdev ] && test_skipped "Can't find a tmp dir on a different file system"
fi