On Mon, 18 Jun 2001, Derek R. Price wrote: > Simon Liddington wrote: > > > Running on solaris 2.7 I had to change sanity.sh as per patch attached. > > The change to the version test has already been checked in. > > Could you please send clips from check.log demonstrating why the other > changes are necessary? When I first ran "make check" I was missing the space before -> in "-> main loop with CVSROOT=" in test multiroot2-9. I originally thought it was a missing \ before . and 'fixed' this as well without realising it was just an escape for . . Then after a rebuild when I discovered client/server hadn't got built in the missing space reappeared but I left the missing \ 'fix' in. So forget the previous patch but ... I rebuilt with --disable-server --disable-client for configure and the space was missing again so you need the attached patch instead. You can see this is correct by looking at server.h where CLIENT_SERVER_STR gets set to "" if there's no server support. Simon ----------------------------------------------------------------------- | Simon Liddington | Tel (home): +44 23 8023 7935 | | [EMAIL PROTECTED] | Tel (work): +44 23 8068 3521 | -----------------------------------------------------------------------
--- cvs-1.11.1p1/src/sanity.sh.orig Mon Jun 18 15:43:01 2001 +++ cvs-1.11.1p1/src/sanity.sh Mon Jun 18 15:43:01 2001 @@ -21871,10 +21871,10 @@ # to work around). if $remote; then :; else dotest multiroot2-9 "${testcvs} -t update" \ -" -> main loop with CVSROOT=${TESTDIR}/root1 +" ?-> main loop with CVSROOT=${TESTDIR}/root1 ${PROG} update: Updating \. ${PROG} update: Updating dir1 - -> main loop with CVSROOT=${TESTDIR}/root2 + ?-> main loop with CVSROOT=${TESTDIR}/root2 ${PROG} update: Updating dir1/sdir ${PROG} update: Updating dir1/sdir/ssdir" fi