X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f09dc86ab65bec2f40bd5651a8bf08dd4d00803f..8f5b554f0b564972a4ce5dcd3e809b3e764ff0f7:/testsuite/devices.test

diff --git a/testsuite/devices.test b/testsuite/devices.test
index 04b9e6a6..5212dd3a 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -7,19 +7,19 @@
 
 # Test rsync handling of devices.  This can only run if you're root.
 
-. $srcdir/testsuite/rsync.fns
-
-set -x
+. "$suitedir/rsync.fns"
 
 # Build some hardlinks
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-
 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 $RUNSHFLAGS "$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
@@ -31,8 +31,10 @@ mknod "$fromdir/char3" c 42 69  || test_skipped "Can't create char device node u
 mknod "$fromdir/block" b 42 69 || test_skipped "Can't create block device node unless root"
 mknod "$fromdir/block2" b 42 73 || test_skipped "Can't create block device node unless root"
 mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root"
+ln "$fromdir/block3" "$fromdir/block3dup" || echo "Skipping hard-linked device test..."
+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