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

diff --git a/testsuite/devices.test b/testsuite/devices.test
index 30636a04..2a6c8a85 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -9,14 +9,17 @@
 
 . "$suitedir/rsync.fns"
 
-set -x
-
 # Build some hardlinks
 
 case `id -u` in
 '') ;; # If "id" failed, try to continue...
-0) ;;
-*) test_skipped "Rsync won't copy devices unless we're root" ;;
+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
+    test_skipped "Rsync won't copy devices unless we're root"
+    ;;
 esac
 
 # TODO: Need to test whether hardlinks are possible on this OS/filesystem
@@ -30,7 +33,7 @@ mknod "$fromdir/block2" b 42 73 || test_skipped "Can't create block device node
 mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root"
 mkfifo "$fromdir/fifo" || test_skipped "Can't run mkfifo"
 
-checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" skip_file_diff
 
 # The script would have aborted on error, so getting here means we've won.
 exit 0