Framework extension to support -Tutf8 tests.

New per-directory variables UTF8_TARGETS and SKIP_ASCII,
intended as subsets of REGRESS_TARGETS.

New .PHONY targets "utf8" and "utf8-clean" to only do -Tutf8 tests;
of course, "all" and "clean" also include this functionality.

While here, prefix internal variables with an underscore.

1 files changed, 94 insertions, 32 deletions

diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc
index d1ac13c98ce..5016f98ddcb 100644
--- a/regress/usr.bin/mandoc/Makefile.inc
+++ b/regress/usr.bin/mandoc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.8 2013/11/10 14:58:44 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.9 2013/11/10 17:43:11 schwarze Exp $
 
 # --- programs ---
 
@@ -8,74 +8,118 @@ MANDOC ?= mandoc
 
 # --- lists of targets ---
 
-ASCIIFILES = ${REGRESS_TARGETS:C/$/.mandoc_ascii/}
-ASCIIDIFFS = ${REGRESS_TARGETS:C/$/.diff_ascii/}
-
-MANFILES = ${REGRESS_TARGETS:C/$/.mandoc_man/} ${REGRESS_TARGETS:C/$/.in_man/}
-MANDIFFS = ${REGRESS_TARGETS:C/$/.diff_man/}
+SKIP_ASCII ?=
 SKIP_TMAN ?=
 
+_ASCIIFILES =
+_ASCIIDIFFS =
+_MANFILES =
+_MANDIFFS =
+.for t in ${REGRESS_TARGETS}
+.  if empty(SKIP_ASCII:MALL) && empty(SKIP_ASCII:M${t})
+_ASCIIFILES += ${t}.mandoc_ascii
+_ASCIIDIFFS += ${t}.diff_ascii
+.    if empty(SKIP_TMAN:MALL) && empty(SKIP_TMAN:M${t})
+_MANFILES += ${t}.in_man ${t}.mandoc_man
+_MANDIFFS += ${t}.diff_man
+.    endif
+.  endif
+.endfor
+
+_UTF8FILES = ${UTF8_TARGETS:C/$/.mandoc_utf8/}
+_UTF8DIFFS = ${UTF8_TARGETS:C/$/.diff_utf8/}
+
 
 # --- convenience targets ---
 
-all: ascii-clean tman-clean
+# Note that bsd.regress.mk automatically adds REGRESS_TARGETS to all.
+all: ascii-clean utf8-clean tman-clean
 
-ascii: ascii-clean ${ASCIIDIFFS}
+ascii: ascii-clean ${_ASCIIDIFFS}
 
-tman: tman-clean ${MANDIFFS}
+utf8: utf8-clean ${_UTF8DIFFS}
 
+tman: tman-clean ${_MANDIFFS}
 
-# --- suffix rules ---
 
-.SUFFIXES:	.diff_ascii .diff_man .in .in_man \
-		.mandoc_ascii .mandoc_man .out_ascii
+# --- suffix rules ---
 
-.in: ${.PREFIX}.diff_ascii ${.PREFIX}.diff_man
-	@:
+.SUFFIXES:	.diff_ascii .diff_utf8 .diff_man .in .in_man \
+		.mandoc_ascii .mandoc_utf8 .mandoc_man \
+		.out_ascii .out_utf8
 
 .in.mandoc_ascii:
-	@echo "${MANDOC} ${.IMPSRC:T} > ${.TARGET}"
-	@${MANDOC} ${.IMPSRC} > ${.TARGET}
+	@echo "${MANDOC} -Tascii ${.IMPSRC:T} > ${.TARGET}"
+	@${MANDOC} -Tascii ${.IMPSRC} > ${.TARGET}
 
 .mandoc_ascii.diff_ascii:
 	@echo "${DIFF} ${.IMPSRC:S/mandoc_ascii$/out_ascii/} ${.IMPSRC}"
 	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_ascii$/out_ascii/} ${.IMPSRC}
 
+.in.mandoc_utf8:
+	@echo "${MANDOC} -Tutf8 ${.IMPSRC:T} > ${.TARGET}"
+	@${MANDOC} -Tutf8 ${.IMPSRC} > ${.TARGET}
+
+.mandoc_utf8.diff_utf8:
+	@echo "${DIFF} ${.IMPSRC:S/mandoc_utf8$/out_utf8/} ${.IMPSRC}"
+	@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_utf8$/out_utf8/} ${.IMPSRC}
+
 .in.in_man:
 	@echo "${MANDOC} -Tman ${.IMPSRC:T} > ${.TARGET}"
 	@${MANDOC} -Tman ${.IMPSRC} > ${.TARGET}
 
 .in_man.mandoc_man:
-	${MANDOC} -Omdoc ${.IMPSRC} > ${.TARGET}
+	${MANDOC} -Tascii -Omdoc ${.IMPSRC} > ${.TARGET}
 
 
 # --- single-file targets ---
 
 .for t in ${REGRESS_TARGETS}
-.  if empty(SKIP_TMAN:MALL) && empty(SKIP_TMAN:M${t})
+.  if empty(SKIP_ASCII:MALL) && empty(SKIP_ASCII:M${t})
+.    if empty(SKIP_TMAN:MALL) && empty(SKIP_TMAN:M${t})
 ${t}.diff_man: ${t}.mandoc_man
 	@echo "${DIFF} ${t}.out_ascii ${.ALLSRC}"
 	@${DIFF} ${.CURDIR}/${t}.out_ascii ${.ALLSRC}
-.  else
+.    else
 ${t}.diff_man:
-.    if empty(SKIP_TMAN:MSILENT)
+.      if empty(SKIP_TMAN:MSILENT)
 	@echo "TODO: -Tman disabled for: ${.TARGET}"
+.      endif
 .    endif
+
+${t}: ${t}.diff_ascii
+.  else
+${t}:
+	@echo "TODO: -Tascii disabled for: ${.TARGET}"
 .  endif
+
+.endfor
+.for t in ${UTF8_TARGETS}
+${t}: ${t}.diff_utf8
 .endfor
 
 
 # --- phony targets ---
 
-clean: ascii-clean tman-clean
+clean: ascii-clean utf8-clean tman-clean
 
 ascii-clean:
-	rm -f ${ASCIIFILES}
+.if !empty(_ASCIIFILES)
+	rm -f ${_ASCIIFILES}
+.endif
+
+utf8-clean:
+.if !empty(_UTF8FILES)
+	rm -f ${_UTF8FILES}
+.endif
 
 tman-clean:
-	rm -f ${MANFILES}
+.if !empty(_MANFILES)
+	rm -f ${_MANFILES}
+.endif
 
-.PHONY: ascii ascii-clean tman tman-clean ${ASCIIDIFFS} ${MANDIFFS}
+.PHONY: ascii ascii-clean utf8 utf8-clean tman tman-clean \
+	${_ASCIIDIFFS} ${_UTF8DIFFS} ${_MANDIFFS}
 
 
 # ----------------------------------------------------------------------
@@ -84,24 +128,30 @@ tman-clean:
 
 # --- the groff program ---
 
-NROFF = /usr/local/bin/nroff -c -mandoc -Tascii
+NROFF = /usr/local/bin/nroff -c -mandoc
 
 
 # --- the list of targets ---
 
 SKIP_GROFF ?=
 
-OUTFILES =
+_OUTFILES =
 .for t in ${REGRESS_TARGETS}
+.  if empty(SKIP_GROFF:M${t}) && \
+      empty(SKIP_ASCII:M${t}) && empty(SKIP_ASCII:MALL)
+_OUTFILES += ${t}.out_ascii
+.  endif
+.endfor
+.for t in ${UTF8_TARGETS}
 .  if empty(SKIP_GROFF:M${t})
-OUTFILES += ${t}.out_ascii
+_OUTFILES += ${t}.out_utf8
 .  endif
 .endfor
 
 
 # --- the convenience target ---
 
-groff: ${REGRESS_TARGETS:C/$/.out_ascii/}
+groff: ${_OUTFILES}
 	@test ! -e ${.CURDIR}/obj || \
 		(echo "*** obj exists, run make obj-clean"; exit 1)
 
@@ -109,13 +159,25 @@ groff: ${REGRESS_TARGETS:C/$/.out_ascii/}
 # --- single-file targets ---
 
 .for t in ${REGRESS_TARGETS}
-.  if empty(SKIP_GROFF:M${t})
+.  if empty(SKIP_ASCII:M${t}) && empty(SKIP_ASCII:MALL)
+.    if empty(SKIP_GROFF:M${t})
 ${t}.out_ascii: ${t}.in
-	${NROFF} ${.ALLSRC} > ${.TARGET}
-.  else
+	${NROFF} -Tascii ${.ALLSRC} > ${.TARGET}
+.    else
 .PHONY: ${t}.out_ascii
 ${t}.out_ascii:
 	@echo "TODO: groff disabled for: ${.TARGET}"
+.    endif
+.  endif
+.endfor
+.for t in ${UTF8_TARGETS}
+.  if empty(SKIP_GROFF:M${t})
+${t}.out_utf8: ${t}.in
+	${NROFF} -Tutf8 ${.ALLSRC} > ${.TARGET}
+.  else
+.PHONY: ${t}.out_utf8
+${t}.out_utf8:
+	@echo "TODO: groff disabled for: ${.TARGET}"
 .  endif
 .endfor
 
@@ -123,7 +185,7 @@ ${t}.out_ascii:
 # --- phony targets ---
 
 groff-clean: obj-clean
-	rm -f ${OUTFILES}
+	rm -f ${_OUTFILES}
 
 obj-clean: clean
 	rm -rf ${.CURDIR}/obj/*