[PATCH] Fix itemize test for objdir != srcdir builds

Art Haas ahaas at airmail.net
Thu Jun 23 23:59:46 GMT 2005


Hi.

The choice of 'config.h' for testing does not consider the possiblity of
objdir != srcdir builds. The small patch below replaces 'config.h'
with 'configure.in' in keeping with the 'config' name choice.

Art Haas

Index: testsuite/itemize.test
===================================================================
RCS file: /cvsroot/rsync/testsuite/itemize.test,v
retrieving revision 1.8
diff -u -r1.8 itemize.test
--- testsuite/itemize.test	10 Jun 2005 23:36:57 -0000	1.8
+++ testsuite/itemize.test	23 Jun 2005 22:51:57 -0000
@@ -32,7 +32,7 @@
 
 makepath "$fromdir/foo"
 makepath "$fromdir/bar/baz"
-cp -p "$srcdir/config.h" "$fromdir/foo/config1"
+cp -p "$srcdir/configure.in" "$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"
@@ -58,7 +58,7 @@
 # Ensure there are no accidental directory-time problems.
 $RSYNC -a -f '-! */' "$fromdir/" "$todir"
 
-cp -p "$srcdir/config.h" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
 chmod 601 "$fromdir/foo/config2"
 $RSYNC -iplrH "$fromdir/" "$todir/" \
     | tee "$outfile"
@@ -91,7 +91,7 @@
 EOT
 diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
 
-cp -p "$srcdir/config.h" "$fromdir/foo/config2"
+cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
 chmod 600 "$fromdir/foo/config2"
 # Lack of -t is for unchanged hard-link stress-test!
 $RSYNC -vvplrH "$fromdir/" "$todir/" \
-- 
Man once surrendering his reason, has no remaining guard against absurdities
the most monstrous, and like a ship without rudder, is the sport of every wind.

-Thomas Jefferson to James Smith, 1822


More information about the rsync mailing list