Re: Is there really any interest in a patch to allow cvs 1.11.6

[Paul Edwards]

"Larry Jones" <lawrence.jones@eds.com> wrote in message 
news:mailman.1289.1065566006.21628.bug-cvs@gnu.org...
> Paul Edwards writes:
> >
> > and then the call to exit() will convert 1 or 2 into EXIT_FAILURE.
>
> So it will.  In that case, the test suite *is* wrong -- the
> dotest_status function is not needed and all of the calls to
> it should just use dotest_fail instead.

And I see you've already committed the change!

Kelly, you're still working on cvs 1.11.6, right?  If so, here's the
patch you need to get your basica-6.2 or whatever it was to pass.

BFN.  Paul.


Index: sanity.sh
===================================================================
RCS file: /cvs/ccvs/src/sanity.sh,v
retrieving revision 1.752.2.23
diff -c -r1.752.2.23 sanity.sh
*** sanity.sh 23 May 2003 19:08:02 -0000 1.752.2.23
--- sanity.sh 8 Oct 2003 12:23:19 -0000
***************
*** 670,688 ****
    dotest_internal "$@"
  }

- # Like dotest except second argument is the required exitstatus.
- dotest_status ()
- {
-   eval "$3" >${TESTDIR}/dotest.tmp 2>&1
-   status=$?
-   if test "$status" != "$2"; then
-     cat ${TESTDIR}/dotest.tmp >>${LOGFILE}
-     echo "exit status was $status; expected $2" >>${LOGFILE}
-     fail "$1"
-   fi
-   dotest_internal "$1" "$3" "$4" "$5"
- }
-
  # Like dotest except output is sorted.
  dotest_sort ()
  {
--- 670,675 ----
***************
*** 1744,1750 ****

     dotest basica-6 "${testcvs} -q update" ''
     echo "ssfile line 2" >>sdir/ssdir/ssfile
!    dotest_status basica-6.2 1 "${testcvs} -q diff -c" \
  "Index: sdir/ssdir/ssfile
  ===================================================================
  RCS file: ${CVSROOT_DIRNAME}/first-dir/sdir/ssdir/ssfile,v
--- 1731,1737 ----

     dotest basica-6 "${testcvs} -q update" ''
     echo "ssfile line 2" >>sdir/ssdir/ssfile
!    dotest_fail basica-6.2 "${testcvs} -q diff -c" \
  "Index: sdir/ssdir/ssfile
  ===================================================================
  RCS file: ${CVSROOT_DIRNAME}/first-dir/sdir/ssdir/ssfile,v
***************
*** 1757,1763 ****
  --- 1,2 ----
    ssfile
  ${PLUS} ssfile line 2"
!    dotest_status basica-6.3 1 "${testcvs} -q diff -c -rBASE" \
  "Index: sdir/ssdir/ssfile
  ===================================================================
  RCS file: ${CVSROOT_DIRNAME}/first-dir/sdir/ssdir/ssfile,v
--- 1744,1750 ----
  --- 1,2 ----
    ssfile
  ${PLUS} ssfile line 2"
!    dotest_fail basica-6.3 "${testcvs} -q diff -c -rBASE" \
  "Index: sdir/ssdir/ssfile
  ===================================================================
  RCS file: ${CVSROOT_DIRNAME}/first-dir/sdir/ssdir/ssfile,v
***************
*** 5585,5591 ****
  date: [0-9/: ]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
  modify
  ============================================================================="
!    dotest_status branches-14.4 1 \
       "${testcvs} diff -c -r 1.1 -r 1.3 file4" \
  "Index: file4
  ===================================================================
--- 5572,5578 ----
  date: [0-9/: ]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -1
  modify
  ============================================================================="
!    dotest_fail branches-14.4 \
       "${testcvs} diff -c -r 1.1 -r 1.3 file4" \
  "Index: file4
  ===================================================================
***************
*** 5600,5606 ****
  ! 4:trunk-1
  --- 1 ----
  ! 4:trunk-3"
!    dotest_status branches-14.5 1 \
       "${testcvs} diff -c -r 1.1 -r 1.2.2.1 file4" \
  "Index: file4
  ===================================================================
--- 5587,5593 ----
  ! 4:trunk-1
  --- 1 ----
  ! 4:trunk-3"
!    dotest_fail branches-14.5 \
       "${testcvs} diff -c -r 1.1 -r 1.2.2.1 file4" \
  "Index: file4
  ===================================================================
***************
*** 22320,22326 ****
     echo goes >> mod2-1/file2-1
     echo down >> mod2-2/file2-2

!    dotest_status multiroot-diff-1 1 "${testcvs} diff" \
  "${PROG} diff: Diffing \.
  ${PROG} [a-z]*: Diffing mod1-1
  Index: mod1-1/file1-1
--- 22307,22313 ----
     echo goes >> mod2-1/file2-1
     echo down >> mod2-2/file2-2

!    dotest_fail multiroot-diff-1 "${testcvs} diff" \
  "${PROG} diff: Diffing \.
  ${PROG} [a-z]*: Diffing mod1-1
  Index: mod1-1/file1-1
***************
*** 23374,23380 ****
  "T dir1/file1
  T dir1/sdir/sfile
  T dir1/sdir/ssdir/ssfile"
!    dotest_status multiroot2-12 1 \
  "${testcvs} -q diff -u -r tag1 -r tag2" \
  "Index: dir1/file1
  ===================================================================
--- 23361,23367 ----
  "T dir1/file1
  T dir1/sdir/sfile
  T dir1/sdir/ssdir/ssfile"
!    dotest_fail multiroot2-12 \
  "${testcvs} -q diff -u -r tag1 -r tag2" \
  "Index: dir1/file1
  ===================================================================