X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/da0405080ebc1bb953853166ceb92fe458b4910b..7918f2440534993bdda324da839b2ea9a3884757:/testsuite/longdir.test

diff --git a/testsuite/longdir.test b/testsuite/longdir.test
index d016740f..8d66bb5f 100644
--- a/testsuite/longdir.test
+++ b/testsuite/longdir.test
@@ -7,15 +7,20 @@
 
 . "$suitedir/rsync.fns"
 
-# set -x
-
 hands_setup
 
-LONGDIR=${FROM}/This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job/This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job/This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job
+longname=This-is-a-directory-with-a-stupidly-long-name-created-in-an-attempt-to-provoke-an-error-found-in-2.0.11-that-should-hopefully-never-appear-again-if-this-test-does-its-job
+longdir="$fromdir/$longname/$longname/$longname"
+
+makepath "$longdir" || test_skipped "unable to create long directory"
+touch "$longdir/1" || test_skipped "unable to create files in long directory"
+date > "$longdir/1"
+if [ -r /etc ]; then
+    ls -la /etc >"$longdir/2"
+else
+    ls -la / >"$longdir/2"
+fi
+checkit "$RSYNC --delete -avH '$fromdir/' '$todir'" "$fromdir/" "$todir"
 
-# the parens around makepath shouldn't be necessary but appear to be
-#  needed on cygwin, presumably because makepath is a /bin/sh function
-(makepath ${LONGDIR}) || test_skipped "unable to create long directory"
-date > ${LONGDIR}/1
-ls -la / > ${LONGDIR}/2
-checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}
+# The script would have aborted on error, so getting here means we've won.
+exit 0