X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7a176e87d56de890fed07b1621277ab74b21b706..648859bda2ecf1ed112277b05adc1430c72747c1:/testsuite/devices.test

diff --git a/testsuite/devices.test b/testsuite/devices.test
index a831e47b..4401572e 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -7,23 +7,32 @@
 
 # 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)  ;;
+*)  if [ -f /usr/bin/fakeroot ]; then
+	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
 
 mkdir "$fromdir"
-mknod "$fromdir/char" c 42 69  || test_skipped "Can't create char device node unless root"
+mknod "$fromdir/char" c 41 67  || test_skipped "Can't create char device node unless root"
+mknod "$fromdir/char2" c 42 68  || test_skipped "Can't create char device node unless root"
+mknod "$fromdir/char3" c 42 69  || test_skipped "Can't create char device node unless root"
 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"
+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
-# last [] may have failed but if we get here then we've won
-