diff options
| author |   schwarze <schwarze@openbsd.org> | 2020-07-21 15:12:07 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2020-07-21 15:12:07 +0000 |
| commit | 49f810c70b75cb9696df16ec3d6f14c1043b87bd (patch) | |
| tree | ad700f7e2f790587459448b755b48ff8ea5276e9 | |
| parent | undocumented options -O outfilename and -O tagfilename (diff) | |
| download | wireguard-openbsd-49f810c70b75cb9696df16ec3d6f14c1043b87bd.tar.xz wireguard-openbsd-49f810c70b75cb9696df16ec3d6f14c1043b87bd.zip | |
adjust test framework to not require a tty
| -rw-r--r-- | regress/usr.bin/mandoc/Makefile.inc | 8 | ||||
| -rwxr-xr-x | regress/usr.bin/mandoc/copyless | 14 |
2 files changed, 4 insertions, 18 deletions
diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc index f80ba133847..326c548b4f4 100644 --- a/regress/usr.bin/mandoc/Makefile.inc +++ b/regress/usr.bin/mandoc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.27 2020/03/13 00:31:05 schwarze Exp $ +# $OpenBSD: Makefile.inc,v 1.28 2020/07/21 15:12:07 schwarze Exp $ .include "Makefile.sub" @@ -83,9 +83,9 @@ htmlval: ${_HTMLVALS} @${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_ascii$/out_ascii/} ${.IMPSRC} .in.mandoc_tag: - @MANPAGER="${BSDSRCDIR}/regress/usr.bin/mandoc/copyless \ - ${.TARGET:S/.mandoc_tag$//}" \ - ${MAN} -l ${MOPTS} -Tascii -Ios=OpenBSD ${.IMPSRC} + @${MAN} -l ${MOPTS} -Ios=OpenBSD -Tascii \ + -O outfilename=${.TARGET:S/tag$/ascii/},tagfilename=${.TARGET} \ + ${.IMPSRC} .mandoc_tag.diff_tag: @${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_tag$/out_tag/} ${.IMPSRC} diff --git a/regress/usr.bin/mandoc/copyless b/regress/usr.bin/mandoc/copyless deleted file mode 100755 index a00c0009b26..00000000000 --- a/regress/usr.bin/mandoc/copyless +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -e -umask 022 -if [ "$#" -ne 4 ]; then - echo "$0 $*: $# args instead of 4" 1>&2 - exit 1 -fi -if [ "$2" != "-T" ]; then - echo "$0 $*: second arg is not -T" 1>&2 - exit 1 -fi -cut -d ' ' -f 1,3 "$3" > "$1.mandoc_tag" -cp "$4" "$1.mandoc_ascii" -exit 0 |