diff options
| author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-08-11 08:15:45 +0000 |
|---|---|---|
| committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2006-08-11 08:15:45 +0000 |
| commit | 840c4dcec1d0cb8ba2be2b678f5083ed260dc322 (patch) | |
| tree | 43d379018e0181e5f88f6bf370c95b68ed502b88 /regress/usr.bin/rcs | |
| parent | 254f544f5375bc6a856079ac95b7f5582400af8b (diff) | |
add tests for merge -e; OK ray@.
Diffstat (limited to 'regress/usr.bin/rcs')
| -rw-r--r-- | regress/usr.bin/rcs/Makefile | 15 | ||||
| -rw-r--r-- | regress/usr.bin/rcs/merge-eflag.out | 4 |
2 files changed, 16 insertions, 3 deletions
diff --git a/regress/usr.bin/rcs/Makefile b/regress/usr.bin/rcs/Makefile index e018fa1ee4b..2f736366fa9 100644 --- a/regress/usr.bin/rcs/Makefile +++ b/regress/usr.bin/rcs/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.34 2006/08/02 04:30:31 niallo Exp $ +# $OpenBSD: Makefile,v 1.35 2006/08/11 08:15:44 xsa Exp $ # Regression tests by Niall O'Higgins <niallo@openbsd.org>. # ksh -> Makefile by Ray Lai <ray@cyth.net>. CI?= ci CO?= co +MERGE?= merge RCS?= rcs RCSCLEAN?= rcsclean RCSDIFF?= rcsdiff @@ -13,8 +14,8 @@ RLOG?= rlog DIFF= diff -u -CLEANFILES= RCS blah.c blah.c,v description file file,v newfile \ - newfile,v test test,v +CLEANFILES= RCS blah.c blah.c,v description file1 file2 file3 \ + file file,v newfile newfile,v test test,v # XXX - These may need to be done in order. # (At least start with ci-initial.) @@ -43,6 +44,7 @@ LTESTS= ci-initial \ rcsclean \ rcsdiff \ rcsdiff-symbols \ + merge-eflag \ rcsmerge \ rcsmerge-symbols \ ci-dflag \ @@ -234,6 +236,13 @@ test-rcsclean: clean @${RCSCLEAN} -q -u file @test -f file +test-merge-eflag: clean + @echo "line1\nline2\nfile1new" > file1 + @echo "line1\nline2" > file2 + @echo "line1\nfile3new\nline2" > file3 + @${MERGE} -p -q -e file1 file2 file3 | \ + ${DIFF} ${.CURDIR}/merge-eflag.out - + test-rcsmerge: @cp -f ${.CURDIR}/rev1 blah.c @echo "descr" | ${CI} -q -l -m"first rev" blah.c diff --git a/regress/usr.bin/rcs/merge-eflag.out b/regress/usr.bin/rcs/merge-eflag.out new file mode 100644 index 00000000000..4c05eb38a5c --- /dev/null +++ b/regress/usr.bin/rcs/merge-eflag.out @@ -0,0 +1,4 @@ +line1 +file3new +line2 +file1new |