diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-02-09 12:20:34 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2008-02-09 12:20:34 +0000 |
| commit | ef70301b27bc8c9a97083d9faa9a09e12da84bfa (patch) | |
| tree | 6b59137d78bd7533b7a1343479eb64c9d4c06efb /regress/usr.bin/cvs | |
| parent | 7bd1bbab67807873abad1d4adc9e5f1f76b9bccf (diff) | |
Get in proper support for checkout/update -A when it comes to keyword
expansion options.
OK joris@
Diffstat (limited to 'regress/usr.bin/cvs')
| -rw-r--r-- | regress/usr.bin/cvs/Makefile | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/regress/usr.bin/cvs/Makefile b/regress/usr.bin/cvs/Makefile index 4615251fc7e..fed3f54251f 100644 --- a/regress/usr.bin/cvs/Makefile +++ b/regress/usr.bin/cvs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2008/02/07 16:16:57 tobias Exp $ +# $OpenBSD: Makefile,v 1.20 2008/02/09 12:20:33 tobias Exp $ # Regression tests by Niall O'Higgins <niallo@openbsd.org> and # Tobias Stoeckmann <tobias@openbsd.org>. @@ -36,6 +36,9 @@ LTESTS= cvs-initial \ cvs-annotate-rflag-inval_branch_rev-fflag \ cvs-annotate-rflag-unknown_symbol-fflag \ cvs-checkout-kflag-kv-rflag-1.1 \ + cvs-update-Aflag-kflag-kv \ + cvs-update-Aflag-kflag-k-rflag-1.1 \ + cvs-update-Aflag-rflag-1.1 \ cvs-update-Aflag \ cvs-status \ cvs-diff \ @@ -265,14 +268,36 @@ test-cvs-rtag-one_more_branch: @grep SECOND_BRANCH ${.OBJDIR}/regress_cvs_root/seed/seed2.txt,v \ | grep 4 > /dev/null -# XXX - Output is not GNU conform test-cvs-update-Aflag: @cd ${.OBJDIR}/regress_cvs_wcopy/seed; \ ${CVS} -Q update -A > /dev/null -# eval 'test `${CVS} -q update -A | wc -l` -eq 1' @eval 'test `grep -c -e T1 -e kkv \ ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 0' +test-cvs-update-Aflag-kflag-kv: + @cd ${.OBJDIR}/regress_cvs_wcopy/seed; \ + ${CVS} -Q update -A -kv > /dev/null + @eval 'test `grep -c T1 \ + ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 0' + @eval 'test `grep -c kv \ + ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 2' + +test-cvs-update-Aflag-kflag-k-rflag-1.1: + @cd ${.OBJDIR}/regress_cvs_wcopy/seed; \ + ${CVS} -Q update -A -kk -r 1.1 > /dev/null + @eval 'test `grep -c T1 \ + ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 2' + @eval 'test `grep -c kk \ + ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 2' + +test-cvs-update-Aflag-rflag-1.1: + @cd ${.OBJDIR}/regress_cvs_wcopy/seed; \ + ${CVS} -Q update -A -r 1.1 > /dev/null + @eval 'test `grep -c T1 \ + ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 2' + @eval 'test `grep -c kk \ + ${.OBJDIR}/regress_cvs_wcopy/seed/CVS/Entries` -eq 0' + test-cvs-update-for_subdir: @echo "test-cvs-update-for_subdir" @cd ${.OBJDIR}/regress_cvs_wcopy/seed; \ |