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

diff --git a/testsuite/devices.test b/testsuite/devices.test
index 804e4c33..bb73aad3 100644
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -18,7 +18,7 @@ case $0 in
 *fake*)
     $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync needs xattrs for fake device tests"
     RSYNC="$RSYNC --fake-super"
-    TLS_ARGS=--fake-super
+    TLS_ARGS="$TLS_ARGS --fake-super"
     case "`xattr 2>&1`" in
     *--list:*)
 	mknod() {
@@ -51,7 +51,7 @@ case $0 in
     esac
     ;;
 *)
-    case `id -u` in
+    case `get_testuid` in
     '') ;; # If "id" failed, try to continue...
     0)  ;;
     *)  if [ -f /usr/bin/fakeroot ]; then
@@ -76,7 +76,8 @@ 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"
 ln "$fromdir/block3" "$fromdir/block2.5" || echo "Skipping hard-linked device test..."
 mkfifo "$fromdir/fifo" || mknod "$fromdir/fifo" p || test_skipped "Can't run mkfifo"
-touch -r "$fromdir/block" "$fromdir/block2"
+# Work around time rounding/truncating issue by touching both files.
+touch -r "$fromdir/block" "$fromdir/block" "$fromdir/block2"
 
 $RSYNC -ai "$fromdir/block" "$todir/block2" \
     | tee "$outfile"
@@ -108,8 +109,8 @@ cat <<EOT >"$chkfile"
 .d..t.$dots ./
 cDc.t.$dots block
 cDc...$dots block2
-cD$all_plus block3
-hD$all_plus block2.5 => block3
+cD$all_plus block2.5
+hD$all_plus block3 => block2.5
 cD$all_plus char
 cD$all_plus char2
 cD$all_plus char3