diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2020-07-06 15:24:12 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2020-07-06 15:24:12 +0000 |
| commit | e391907f8c65fabc8c0bbfdc2b58198166d7d4e0 (patch) | |
| tree | 6c03cc98d4e5e6decce22bbc45667bc8d9041c15 /regress | |
| parent | d8aa63df5fc8a037352f116c52139532d3af096d (diff) | |
Add a few ${.CURDIR} to make the new RCS tests work with obj/ and obj@.
ok stsp
Diffstat (limited to 'regress')
| -rw-r--r-- | regress/usr.bin/rcs/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/regress/usr.bin/rcs/Makefile b/regress/usr.bin/rcs/Makefile index defadaeeeff..b789b021c21 100644 --- a/regress/usr.bin/rcs/Makefile +++ b/regress/usr.bin/rcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2020/06/26 07:55:57 stsp Exp $ +# $OpenBSD: Makefile,v 1.44 2020/07/06 15:24:11 tb Exp $ # Regression tests by Niall O'Higgins <niallo@openbsd.org>. # ksh -> Makefile by Ray Lai <ray@cyth.net>. @@ -250,28 +250,28 @@ test-merge-eflag: clean test-merge-noeol: clean @echo "<<<<<<< file1\nline1=======\nline3\n>>>>>>> file3" \ - > merge-noeol.out + > ${.CURDIR}/merge-noeol.out @echo -n "line1" > file1 @echo "line2" > file2 @echo "line3" > file3 @${MERGE} -p -q file1 file2 file3 | \ ${DIFF} ${.CURDIR}/merge-noeol.out - @echo "<<<<<<< file1\nline1\n=======\nline3\n>>>>>>> file3" \ - > merge-noeol.out + > ${.CURDIR}/merge-noeol.out @echo "line1" > file1 @echo -n "line2" > file2 @echo "line3" > file3 @${MERGE} -p -q file1 file2 file3 | \ ${DIFF} ${.CURDIR}/merge-noeol.out - @echo "<<<<<<< file1\nline1\n=======\nline3>>>>>>> file3" \ - > merge-noeol.out + > ${.CURDIR}/merge-noeol.out @echo "line1" > file1 @echo "line2" > file2 @echo -n "line3" > file3 @${MERGE} -p -q file1 file2 file3 | \ ${DIFF} ${.CURDIR}/merge-noeol.out - @echo "<<<<<<< file1\nline1=======\nline3>>>>>>> file3" \ - > merge-noeol.out + > ${.CURDIR}/merge-noeol.out @echo -n "line1" > file1 @echo -n "line2" > file2 @echo -n "line3" > file3 @@ -625,9 +625,9 @@ test-ci-parse-keywords2: clean # Check for correct EOF handling in rcs parser test-co-parse-truncated: clean - @sh -c 'ulimit -d 5000 && ${CO} -q ${.CURDIR}/test-truncated > truncated.out 2>&1' || \ + @sh -c 'ulimit -d 5000 && ${CO} -q ${.CURDIR}/test-truncated > ${.CURDIR}/truncated.out 2>&1' || \ case "$$?" in 1) exit 0;; esac && exit 1 - @grep -q 'co: could not parse admin data' truncated.out + @grep -q 'co: could not parse admin data' ${.CURDIR}/truncated.out test-ci-2files: clean @touch foo bar |