Re: rdiff

[Paul Edwards]

"Derek Robert Price" <derek@ximbiot.com> wrote in message 
news:mailman.7381.1054830569.21513.bug-cvs@gnu.org...
> Please read ccvs/TESTS for information on how to write
> ccvs/src/sanity.sh tests.  They aren't so hard.  It amounts to a series
> of calls to `dotest <command> <expected output>' with some variables in
> the <expected output> to allow for differences in environment - paths,
> usernames, and the like.  There is one main loop with a case statement
> with all the tests.  Add an `rdiff-add-remove-nodiff)' case to that case
> statement & the calls to dotest after that.  I'll clean it up if you can
> get it close.

Ok, this is hopefully "close".  It is derived from an MSDOS .bat file
that I created...

Index: sanity.sh
===================================================================
RCS file: /cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.24
diff -c -r1.752.2.24 sanity.sh
*** sanity.sh 2 Jun 2003 20:02:11 -0000 1.752.2.24
--- sanity.sh 7 Jun 2003 06:37:09 -0000
***************
*** 3989,3994 ****
--- 3989,4039 ----
    rm -rf ${CVSROOT_DIRNAME}/trdiff
    ;;

+         rdiff-add-remove-nodiff)
+    # Test that the short patch behaves as expected
+    rm -fr abc
+           mkdir abc
+    ${testcvs} -q import -I ! -m initial-import abc vendor initial
+           ${testcvs} get abc
+           cd abc
+           echo "abc" >file1.txt
+           ${testcvs} add file1.txt
+           ${testcvs} commit -m "." file1.txt
+           echo def >>file1.txt
+           ${testcvs} commit -m "." file1.txt
+           echo "abc" >file1.txt
+           ${testcvs} commit -m "." file1.txt
+           ${testcvs} tag -r 1.1 tag1 file1.txt
+           ${testcvs} tag -r 1.2 tag2 file1.txt
+           ${testcvs} tag -r 1.3 tag3 file1.txt
+           echo "abc" >file2.txt
+           ${testcvs} add file2.txt
+           ${testcvs} commit -m "." file2.txt
+           ${testcvs} tag -r 1.1 tag4 file2.txt
+           ${testcvs} tag -r 1.1 tag5 file2.txt
+           cd ..
+           rm -fr abc
+
+    dotest rdiff-no-real-change \
+ "${testcvs} rdiff -s -r tag1 -r tag3 abc" \
+ ''
+
+    dotest rdiff-real-change \
+ "${testcvs} rdiff -s -r tag1 -r tag2 abc" \
+ 'File abc/file1.txt changed from revision 1.1 to 1.2'
+
+    dotest_sort rdiff-remove-add \
+ "${testcvs} rdiff -s -r tag2 -r tag4 abc" \
+ 'File abc/file1.txt is removed; previous revision 1.2 not included in release 
tag tag4
+ File abc/file2.txt is new; current revision 1.1'
+
+    dotest rdiff-no-change \
+ "${testcvs} rdiff -s -r tag4 -r tag5 abc" \
+ ''
+
+           rm -rf ${CVSROOT_DIRNAME}/abc
+
+
   rdiff2)
     # Test for the segv problem reported by James Cribb
     # Somewhere to work