diff options
| -rw-r--r-- | regress/usr.bin/rcs/Makefile | 4 | ||||
| -rw-r--r-- | regress/usr.bin/rcs/rcsdiff.out | 4 | ||||
| -rw-r--r-- | regress/usr.bin/rcs/rcsmerge.out | 2 | ||||
| -rw-r--r-- | regress/usr.bin/rcs/rev1 | 1 | ||||
| -rw-r--r-- | regress/usr.bin/rcs/rev2 | 1 | ||||
| -rw-r--r-- | regress/usr.bin/rcs/rev3 | 1 |
6 files changed, 2 insertions, 11 deletions
diff --git a/regress/usr.bin/rcs/Makefile b/regress/usr.bin/rcs/Makefile index 027388729ea..f1c965c5b2c 100644 --- a/regress/usr.bin/rcs/Makefile +++ b/regress/usr.bin/rcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1 2006/03/11 06:22:47 ray Exp $ +# $OpenBSD: Makefile,v 1.2 2006/03/12 00:36:00 ray Exp $ # Regression tests by Niall O'Higgins <niallo@openbsd.org>. # ksh -> Makefile by Ray Lai <ray@cyth.net>. @@ -164,7 +164,6 @@ test-rcsmerge: @${CI} -q -l -m"third rev" blah.c @${RCSMERGE} -q -r1.1 -r1.3 -p blah.c | \ - sed 's/\($$Id: Makefile,v 1.1 2006/03/11 06:22:47 ray Exp $$]*/\1/' | \ diff -u ${.CURDIR}/rcsmerge.out - test-rcsdiff: @@ -178,7 +177,6 @@ test-rcsdiff: @${CI} -q -l -m"third rev" blah.c @${RCSDIFF} -q -r1.1 -r1.3 -u blah.c | tail -n +3 | \ - sed 's/\($$Id: Makefile,v 1.1 2006/03/11 06:22:47 ray Exp $$]*/\1/' | \ diff -u ${.CURDIR}/rcsdiff.out - # Testing 'ci -d'2037-01-12 04:00:00+00' -l test diff --git a/regress/usr.bin/rcs/rcsdiff.out b/regress/usr.bin/rcs/rcsdiff.out index 17de04b5de4..c15c1f7e163 100644 --- a/regress/usr.bin/rcs/rcsdiff.out +++ b/regress/usr.bin/rcs/rcsdiff.out @@ -1,7 +1,5 @@ -@@ -1,2 +1,15 @@ --/* $Id: rcsdiff.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */ +@@ -1 +1,14 @@ -blah(); -+/* $Id: rcsdiff.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> diff --git a/regress/usr.bin/rcs/rcsmerge.out b/regress/usr.bin/rcs/rcsmerge.out index ca484deddc2..e29d3eb526b 100644 --- a/regress/usr.bin/rcs/rcsmerge.out +++ b/regress/usr.bin/rcs/rcsmerge.out @@ -1,5 +1,4 @@ <<<<<<< blah.c -/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -15,7 +14,6 @@ main(int argc, char **argv) return (0); } ======= -/* $Id: rcsmerge.out,v 1.1 2006/03/11 06:22:47 ray Exp $ */ #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/regress/usr.bin/rcs/rev1 b/regress/usr.bin/rcs/rev1 index a980646e49e..2eec0afbb95 100644 --- a/regress/usr.bin/rcs/rev1 +++ b/regress/usr.bin/rcs/rev1 @@ -1,2 +1 @@ -/* $Id: rev1,v 1.1 2006/03/11 06:22:47 ray Exp $ */ blah(); diff --git a/regress/usr.bin/rcs/rev2 b/regress/usr.bin/rcs/rev2 index 5b76b765ac4..7f0a01d7446 100644 --- a/regress/usr.bin/rcs/rev2 +++ b/regress/usr.bin/rcs/rev2 @@ -1,4 +1,3 @@ -/* $Id: rev2,v 1.1 2006/03/11 06:22:47 ray Exp $ */ #include <stdio.h> blah(); diff --git a/regress/usr.bin/rcs/rev3 b/regress/usr.bin/rcs/rev3 index 307d7f785de..71ace5fc458 100644 --- a/regress/usr.bin/rcs/rev3 +++ b/regress/usr.bin/rcs/rev3 @@ -1,4 +1,3 @@ -/* $Id: rev3,v 1.1 2006/03/11 06:22:47 ray Exp $ */ #include <stdio.h> #include <stdlib.h> #include <string.h> |