X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1ed9018e69a0d224ff59184974d9150d1cb8814d..73b9b90a0b548d1177d2bf004c800ae6d9926a1f:/testsuite/itemize.test

diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 72780345..78637ca4 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -17,7 +17,7 @@ outfile="$scratchdir/rsync.out"
 
 makepath "$fromdir/foo"
 makepath "$fromdir/bar/baz"
-cp -p "$srcdir/configure.in" "$fromdir/foo/config1"
+cp -p "$srcdir/configure.ac" "$fromdir/foo/config1"
 cp -p "$srcdir/config.h.in" "$fromdir/foo/config2"
 cp -p "$srcdir/rsync.h" "$fromdir/bar/baz/rsync"
 chmod 600 "$fromdir"/foo/config? "$fromdir/bar/baz/rsync"
@@ -28,8 +28,7 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra"
 rm -f "$to2dir"
 
 # Check if rsync is set to hard-link symlinks.
-confile=`echo "$scratchdir" | sed 's;/testtmp/itemize$;/config.h;'`
-if egrep '^#define CAN_HARDLINK_SYMLINK 1' "$confile" >/dev/null; then
+if egrep '^#define CAN_HARDLINK_SYMLINK 1' config.h >/dev/null; then
     L=hL
 else
     L=cL
@@ -67,7 +66,7 @@ diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
 # Ensure there are no accidental directory-time problems.
 $RSYNC -a -f '-! */' "$fromdir/" "$todir"
 
-cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.ac" "$fromdir/foo/config2"
 chmod 601 "$fromdir/foo/config2"
 $RSYNC -iplrH "$fromdir/" "$todir/" \
     | tee "$outfile"
@@ -100,7 +99,7 @@ cLc$T.$dots foo/sym -> ../bar/baz/rsync
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
 
-cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.ac" "$fromdir/foo/config2"
 chmod 600 "$fromdir/foo/config2"
 # Lack of -t is for unchanged hard-link stress-test!
 $RSYNC -vvplrH "$fromdir/" "$todir/" \
@@ -109,9 +108,9 @@ filter_outfile
 cat <<EOT >"$chkfile"
 bar/baz/rsync is uptodate
 foo/config1 is uptodate
-foo/config2
 foo/extra is uptodate
 foo/sym is uptodate
+foo/config2
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
 
@@ -204,8 +203,8 @@ bar/baz/rsync is uptodate
 foo/ is uptodate
 foo/config1 is uptodate
 foo/config2 is uptodate
-foo/extra => foo/config1
 foo/sym $is_uptodate
+foo/extra => foo/config1
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed"