Reorganize the tests that require custom command line options

such that they don't abort the whole test suite if one of them fails.

3 files changed, 19 insertions, 27 deletions

diff --git a/regress/usr.bin/mandoc/roff/de/Dd.out_ascii_opt b/regress/usr.bin/mandoc/roff/de/Dd_opt.out_ascii
index 72139186a9b..72139186a9b 100644
--- a/regress/usr.bin/mandoc/roff/de/Dd.out_ascii_opt
+++ b/regress/usr.bin/mandoc/roff/de/Dd_opt.out_ascii
diff --git a/regress/usr.bin/mandoc/roff/de/Makefile b/regress/usr.bin/mandoc/roff/de/Makefile
index 7f40d403c04..08632011e28 100644
--- a/regress/usr.bin/mandoc/roff/de/Makefile
+++ b/regress/usr.bin/mandoc/roff/de/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2020/07/30 21:32:19 schwarze Exp $
+# $OpenBSD: Makefile,v 1.15 2022/08/02 10:59:51 schwarze Exp $
 
 REGRESS_TARGETS	 = append cond empty escname factorial
 REGRESS_TARGETS	+= indir infinite startde tab TH Dd
@@ -9,40 +9,32 @@ LINT_TARGETS	 = escname indir infinite
 
 SKIP_GROFF	 = infinite
 
-.include <bsd.regress.mk>
-
-
-# --- additions to public targets ---
-
-all ascii: ascii-diff-opt
 
-ascii-clean: ascii-clean-opt
-
-groff: TH.out_ascii_opt Dd.out_ascii_opt
+# --- local rules ---
 
-groff-clean: groff-clean-opt
+REGRESS_TARGETS	+= TH_opt Dd_opt
 
+TH_opt.in: TH.in
+	cp ${.ALLSRC} ${.TARGET}
 
-# --- local rules ---
+Dd_opt.in: Dd.in
+	cp ${.ALLSRC} ${.TARGET}
 
-ascii-diff-opt: TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
-	${DIFF} ${.CURDIR}/TH.out_ascii_opt TH.mandoc_ascii_opt
-	${DIFF} ${.CURDIR}/Dd.out_ascii_opt Dd.mandoc_ascii_opt
+TH_opt.mandoc_ascii: TH_opt.in
+	${MANDOC} ${MOPTS} -Ios=OpenBSD -Tascii -man TH_opt.in > ${.TARGET}
 
-TH.mandoc_ascii_opt: TH.in
-	${MANDOC} -Ios=OpenBSD -Tascii -man ${.ALLSRC} > ${.TARGET}
+Dd_opt.mandoc_ascii: Dd_opt.in
+	${MANDOC} ${MOPTS} -Ios=OpenBSD -Tascii -mdoc Dd_opt.in > ${.TARGET}
 
-Dd.mandoc_ascii_opt: Dd.in
-	${MANDOC} -Ios=OpenBSD -Tascii -mdoc ${.ALLSRC} > ${.TARGET}
+TH_opt.out_ascii: TH_opt.in
+	${GROFF} -Tascii -man TH_opt.in > ${.TARGET}
 
-ascii-clean-opt:
-	rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
+Dd_opt.out_ascii: Dd_opt.in
+	${GROFF} -Tascii -mdoc Dd_opt.in > ${.TARGET}
 
-TH.out_ascii_opt: TH.in
-	/usr/local/bin/nroff -c -man -Tascii ${.ALLSRC} > ${.TARGET}
+clean: local-clean
 
-Dd.out_ascii_opt: Dd.in
-	/usr/local/bin/nroff -c -mdoc -Tascii ${.ALLSRC} > ${.TARGET}
+local-clean: 
+	rm -f TH_opt.in Dd_opt.in
 
-groff-clean-opt:
-	rm -f TH.out_ascii_opt Dd.out_ascii_opt
+.include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/roff/de/TH.out_ascii_opt b/regress/usr.bin/mandoc/roff/de/TH_opt.out_ascii
index 9b5c64b0b36..9b5c64b0b36 100644
--- a/regress/usr.bin/mandoc/roff/de/TH.out_ascii_opt
+++ b/regress/usr.bin/mandoc/roff/de/TH_opt.out_ascii