X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b0d4f4c10ed89cff36ceec26a510ac36d51dea0a..bb21ecac5bf5cb6e586476bbc754c709f71b3252:/testsuite/chown.test

diff --git a/testsuite/chown.test b/testsuite/chown.test
index 751edbe2..90af529e 100644
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -11,14 +11,21 @@
 # We don't know what users will be present on this system, so we just
 # use random numeric uids and gids.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
-# Build some hardlinks
+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
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
+# Build some hardlinks
 
 mkdir "$fromdir"
 name1="$fromdir/name1"
@@ -26,13 +33,12 @@ name2="$fromdir/name2"
 echo "This is the file" > "$name1"
 echo "This is the other file" > "$name2"
 
-chown 5000 "$name1" || test_skipped "Can't chown"
-chown 5001 "$name2" || test_skipped "Can't chown"
-chgrp 5002 "$name1" || test_skipped "Can't chgrp"
-chgrp 5003 "$name2" || test_skipped "Can't chgrp"
+chown 5000 "$name1" || test_skipped "Can't chown (probably need root)"
+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"
+checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 
+# The script would have aborted on error, so getting here means we've won.
 exit 0
-# last [] may have failed but if we get here then we've won
-