/[cvs]/ccvs/src/sanity.sh
ViewVC logotype

Diff of /ccvs/src/sanity.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1104 by dprice, Wed Nov 23 01:29:08 2005 UTC revision 1.1105 by mdb, Wed Nov 30 19:04:18 2005 UTC
# Line 2722  export CVS_SERVER Line 2722  export CVS_SERVER
2722    
2723  # No need to check the PID of the last client since we are testing with  # No need to check the PID of the last client since we are testing with
2724  # Redirect disabled.  # Redirect disabled.
2725  proot_arg="--allow-root=$SECONDARY_CVSROOT_DIRNAME"  proot_arg="--allow-root=$SECONDARY_CVSROOT_DIRNAME --allow-root=$PRIMARY_CVSROOT_DIRNAME"
2726  exec $CVS_SERVER \$proot_arg "\$@"  exec $CVS_SERVER \$proot_arg "\$@"
2727  EOF  EOF
2728          cat <<EOF >$TESTDIR/primary-wrapper          cat <<EOF >$TESTDIR/primary-wrapper
# Line 31314  ${CVSROOT_DIRNAME}dir1 Line 31314  ${CVSROOT_DIRNAME}dir1
31314  noop  noop
31315  EOF  EOF
31316    
31317              dotest 2-3 "${servercvs} server" \              dotest server2-3 "${servercvs} server" \
31318  "E protocol error: directory '${TESTDIR}' not within root '${CVSROOT_DIRNAME}'  "E protocol error: directory '${TESTDIR}' not within root '${CVSROOT_DIRNAME}'
31319  error  " <<EOF  error  " <<EOF
31320  Root ${CVSROOT_DIRNAME}  Root ${CVSROOT_DIRNAME}
# Line 31336  ${CVSROOT_DIRNAME} Line 31336  ${CVSROOT_DIRNAME}
31336  Unchanged foo/bar  Unchanged foo/bar
31337  noop  noop
31338  EOF  EOF
31339    
31340                dotest server2-5 \
31341    "${servercvs} --allow-root=${CVSROOT_DIRNAME}.bad server" \
31342    "E Bad root ${CVSROOT_DIRNAME}
31343    error  " <<EOF
31344    Root ${CVSROOT_DIRNAME}
31345    noop
31346    EOF
31347                dotest server2-6 \
31348    "${servercvs} --allow-root=${CVSROOT_DIRNAME} server" \
31349    "ok" <<EOF
31350    Root ${CVSROOT_DIRNAME}
31351    noop
31352    EOF
31353              servercvs=$save_servercvs              servercvs=$save_servercvs
31354            fi            fi
31355            ;;            ;;
# Line 32301  export CVS_SERVER Line 32315  export CVS_SERVER
32315    
32316  # No need to check the PID of the last client since we are testing with  # No need to check the PID of the last client since we are testing with
32317  # Redirect disabled.  # Redirect disabled.
32318  proot_arg="--allow-root $SECONDARY_CVSROOT_DIRNAME"  proot_arg="--allow-root $SECONDARY_CVSROOT_DIRNAME --allow-root $PRIMARY_CVSROOT_DIRNAME"
32319  exec $servercvs \$proot_arg "\$@"  exec $servercvs \$proot_arg "\$@"
32320  EOF  EOF
32321            cat <<EOF >$TESTDIR/writeproxy-primary-wrapper            cat <<EOF >$TESTDIR/writeproxy-primary-wrapper
# Line 32676  export CVS_SERVER Line 32690  export CVS_SERVER
32690    
32691  # No need to check the PID of the last client since we are testing with  # No need to check the PID of the last client since we are testing with
32692  # Redirect disabled.  # Redirect disabled.
32693  proot_arg="--allow-root=$SECONDARY_CVSROOT_DIRNAME"  proot_arg="--allow-root=$SECONDARY_CVSROOT_DIRNAME --allow-root=$PRIMARY_CVSROOT_DIRNAME"
32694  exec $CVS_SERVER \$proot_arg "\$@"  exec $CVS_SERVER \$proot_arg "\$@"
32695  EOF  EOF
32696            cat <<EOF >$TESTDIR/writeproxy-primary-wrapper            cat <<EOF >$TESTDIR/writeproxy-primary-wrapper

Legend:
Removed from v.1.1104  
changed lines
  Added in v.1.1105

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26