One more tweak.

[rsync/rsync.git] / testsuite / chown.test

diff --git a/testsuite/chown.test b/testsuite/chown.test
index cd841fa..698593b 100644 (file)
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -13,6 +13,16 @@
 
 . "$suitedir/rsync.fns"
 
+case `id -u` in
+'') ;; # If "id" failed, try to continue...
+0)  ;;
+*)  if [ -f /usr/bin/fakeroot ]; then
+       echo "Let's try re-running the script under fakeroot..."
+       exec /usr/bin/fakeroot /bin/sh "$0"
+    fi
+    ;;
+esac
+
 # Build some hardlinks
 
 mkdir "$fromdir"
@@ -26,7 +36,8 @@ chown 5001 "$name2" || test_skipped "Can't chown (probably need root)"
 chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)"
 chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)"
 
-checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+cd "$fromdir/.."
+checkit "$RSYNC -aHvv from/ to/" "$fromdir" "$todir"
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0