Index: sanity.sh =================================================================== RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v retrieving revision 1.1098 diff -u -p -r1.1098 sanity.sh --- sanity.sh 3 Nov 2005 16:58:20 -0000 1.1098 +++ sanity.sh 5 Nov 2005 05:56:50 -0000 @@ -2661,7 +2661,7 @@ newroot() { # Set up CVSROOT (the crerepos tests will test operating without CVSROOT set). # # Currently we test :fork: and :ext: (see crerepos test). There is a -# known difference between the two in modes-15 (see comments there). +# known difference between the two in modes-19 (see comments there). # # :ext: can be tested against a remote machine if: # @@ -23919,15 +23919,49 @@ new revision: 1\.3; previous revision: 1 "-r--r----- .*" fi + # Check admin --execute + # Cygwin, already. + if test -n "$remotehost"; then + $CVS_RSH $remotehost "chmod ugo=r ${CVSROOT_DIRNAME}/first-dir/aa,v" + else + chmod ugo=r ${CVSROOT_DIRNAME}/first-dir/aa,v + fi + dotest modes-8 "${testcvs} admin --execute aa" \ +"RCS file: /tmp/cvs-sanity/cvsroot/first-dir/aa,v +done" + # Cygwin. + if test -n "$remotehost"; then + dotest modes-9remotehost "$CVS_RSH $remotehost 'ls -l ${CVSROOT_DIRNAME}/first-dir/aa,v'" \ +"-r-xr-xr-x .*" + else + dotest modes-9 "ls -l ${CVSROOT_DIRNAME}/first-dir/aa,v" \ +"-r-xr-xr-x .*" + fi + + # Test if admin --no-execute removes the execute bit: + dotest modes-10 "${testcvs} admin --no-execute aa" \ +"RCS file: /tmp/cvs-sanity/cvsroot/first-dir/aa,v +done" + # Cygwin. + if test -n "$remotehost"; then + dotest modes-11remotehost "$CVS_RSH $remotehost 'ls -l ${CVSROOT_DIRNAME}/first-dir/aa,v'" \ +"-r--r--r-- .*" + else + dotest modes-11 "ls -l ${CVSROOT_DIRNAME}/first-dir/aa,v" \ +"-r--r--r-- .*" + fi + + # alx end my stuff + CVSUMASK=007 export CVSUMASK touch ab # Might as well test the execute bit too. chmod +x ab - dotest modes-8 "$testcvs add ab" \ + dotest modes-12 "$testcvs add ab" \ "$SPROG add: scheduling file .ab. for addition $SPROG add: use .$SPROG commit. to add this file permanently" - dotest modes-9 "$testcvs -q ci -m add" \ + dotest modes-13 "$testcvs -q ci -m add" \ "$CVSROOT_DIRNAME/first-dir/ab,v <-- ab initial revision: 1\.1" @@ -23938,33 +23972,33 @@ initial revision: 1\.1" # # I don't recall why, but I used to look for: # - # dotest modes-10remotehost \ + # dotest modes-14remotehost \ # "$CVS_RSH $remotehost 'ls -l $CVSROOT_DIRNAME/first-dir/ab,v'" \ # "-r--r--r--.*" # # here when $remotehost was set. I'm not sure why. Maybe this was # one of the innumerable Cygwin issues? - dotest modes-10 "ls -l $CVSROOT_DIRNAME/first-dir/ab,v" \ + dotest modes-14 "ls -l $CVSROOT_DIRNAME/first-dir/ab,v" \ "-r-xr-x---.*" # OK, now add a file on a branch. Check that the mode gets # set the same way (it is a different code path in CVS). - dotest modes-11 "${testcvs} -q tag -b br" 'T aa + dotest modes-15 "${testcvs} -q tag -b br" 'T aa T ab' - dotest modes-12 "${testcvs} -q update -r br" '' + dotest modes-16 "${testcvs} -q update -r br" '' touch ac - dotest modes-13 "${testcvs} add ac" \ + dotest modes-17 "${testcvs} add ac" \ "${SPROG} add: scheduling file .ac. for addition on branch .br. ${SPROG} add: use .${SPROG} commit. to add this file permanently" # Not sure it really makes sense to refer to a "previous revision" # when we are just now adding the file; as far as I know # that is longstanding CVS behavior, for what it's worth. - dotest modes-14 "${testcvs} -q ci -m add" \ + dotest modes-18 "${testcvs} -q ci -m add" \ "$CVSROOT_DIRNAME/first-dir/Attic/ac,v <-- ac new revision: 1\.1\.2\.1; previous revision: 1\.1" - # ssh-wrapper forwards CVSUMASK. See modes-10 for notes. - dotest modes-15 \ + # ssh-wrapper forwards CVSUMASK. See modes-14 for notes. + dotest modes-19 \ "ls -l ${CVSROOT_DIRNAME}/first-dir/Attic/ac,v" \ "-r--r-----.*"