summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2015-02-03 19:37:25 +0000
committerschwarze <schwarze@openbsd.org>2015-02-03 19:37:25 +0000
commit0ee35adc534a85e8bd74e45a985f2378a4a4fc12 (patch)
tree0c1f6f6b716f7e4d60c484b280a5440fa0d94c0c
parentreduce indentation for better readability (diff)
downloadwireguard-openbsd-0ee35adc534a85e8bd74e45a985f2378a4a4fc12.tar.xz
wireguard-openbsd-0ee35adc534a85e8bd74e45a985f2378a4a4fc12.zip
Make the mandoc test suite completely silent.
Not even i looked at the 966 mandoc command lines and the 787 diff command lines it was spewing, and it was almost unusable without REGRESS_FAIL_EARLY because any errors got lost among all the noise. If you want to debug the Makefiles, use "make -dl". If you want to see the -Tman TODOs, use "grep -RF SKIP_TMAN".
-rw-r--r--regress/usr.bin/mandoc/Makefile.inc29
-rw-r--r--regress/usr.bin/mandoc/char/Makefile.inc4
-rw-r--r--regress/usr.bin/mandoc/eqn/Makefile.inc9
-rw-r--r--regress/usr.bin/mandoc/man/Makefile.inc4
-rw-r--r--regress/usr.bin/mandoc/roff/Makefile.inc4
-rw-r--r--regress/usr.bin/mandoc/roff/de/Makefile12
-rw-r--r--regress/usr.bin/mandoc/tbl/Makefile.inc4
7 files changed, 25 insertions, 41 deletions
diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc
index 4041fd3a469..bc25a5befcc 100644
--- a/regress/usr.bin/mandoc/Makefile.inc
+++ b/regress/usr.bin/mandoc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.19 2014/12/30 08:52:55 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.20 2015/02/03 19:37:25 schwarze Exp $
.include "Makefile.sub"
@@ -68,44 +68,35 @@ htmlval: ${_HTMLVALS}
.out_ascii .out_lint .out_utf8
.in.mandoc_ascii:
- @echo "${MANDOC} ${MOPTS} -Tascii ${.IMPSRC:T} > ${.TARGET}"
@${MANDOC} ${MOPTS} -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} ${MOPTS} -Tutf8 ${.IMPSRC:T} > ${.TARGET}"
@${MANDOC} ${MOPTS} -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.mandoc_html:
- @echo "${MANDOC} ${MOPTS} -Thtml ${.IMPSRC:T} > ${.TARGET}"
@${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} | \
sed -n '/^BEGINTEST/,/^ENDTEST/p' > ${.TARGET}
.mandoc_html.diff_html:
- @echo "${DIFF} ${.IMPSRC:S/mandoc_html$/out_html/} ${.IMPSRC}"
@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_html$/out_html/} ${.IMPSRC}
.in.in_man:
- @echo "${MANDOC} ${MOPTS} -Tman ${.IMPSRC:T} > ${.TARGET}"
@${MANDOC} ${MOPTS} -Tman ${.IMPSRC} > ${.TARGET}
.in_man.mandoc_man:
- ${MANDOC} -man -Tascii -Omdoc ${.IMPSRC} > ${.TARGET}
+ @${MANDOC} -man -Tascii -Omdoc ${.IMPSRC} > ${.TARGET}
.in.mandoc_lint:
- @echo "${MANDOC} ${MOPTS} -Tlint ${.IMPSRC:T} > ${.TARGET} 2>&1"
@-${MANDOC} ${MOPTS} -Tlint ${.IMPSRC} 2>&1 | \
sed -E 's/^mandoc: \/[^:]+\//mandoc: /' > ${.TARGET}
.mandoc_lint.diff_lint:
- @echo "${DIFF} ${.IMPSRC:S/mandoc_lint$/out_lint/} ${.IMPSRC}"
@${DIFF} ${.CURDIR}/${.IMPSRC:S/mandoc_lint$/out_lint/} ${.IMPSRC}
# --- single-file targets ---
@@ -114,21 +105,15 @@ htmlval: ${_HTMLVALS}
. 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
${t}.diff_man:
-. if empty(SKIP_TMAN:MSILENT)
- @echo "TODO: -Tman disabled for: ${.TARGET}"
-. endif
. endif
${t}: ${t}.diff_ascii ${t}.diff_man
. else
${t}:
- @echo "TODO: -Tascii disabled for: ${.TARGET}"
. endif
${t}.validate_html: ${t}.in
- @echo "${MANDOC} ${MOPTS} -Thtml ${t}.in | validate"
@-${MANDOC} ${MOPTS} -Thtml ${.ALLSRC} | validate
.endfor
@@ -150,27 +135,27 @@ clean: ${_CLEAN_TARGETS}
ascii-clean:
.if !empty(_ASCIIFILES)
- rm -f ${_ASCIIFILES}
+ @rm -f ${_ASCIIFILES}
.endif
utf8-clean:
.if !empty(_UTF8FILES)
- rm -f ${_UTF8FILES}
+ @rm -f ${_UTF8FILES}
.endif
html-clean:
.if !empty(_HTMLFILES)
- rm -f ${_HTMLFILES}
+ @rm -f ${_HTMLFILES}
.endif
tman-clean:
.if !empty(_MANFILES)
- rm -f ${_MANFILES}
+ @rm -f ${_MANFILES}
.endif
lint-clean:
.if !empty(_LINTFILES)
- rm -f ${_LINTFILES}
+ @rm -f ${_LINTFILES}
.endif
.PHONY: ${_ASCIIDIFFS} ${_UTF8DIFFS} ${_HTMLDIFFS} ${_MANDIFFS} \
diff --git a/regress/usr.bin/mandoc/char/Makefile.inc b/regress/usr.bin/mandoc/char/Makefile.inc
index 60ec6449950..6b294ca9d13 100644
--- a/regress/usr.bin/mandoc/char/Makefile.inc
+++ b/regress/usr.bin/mandoc/char/Makefile.inc
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.2 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2015/02/03 19:37:25 schwarze Exp $
-SKIP_TMAN?=ALL SILENT
+SKIP_TMAN ?= ALL
.include "../Makefile.inc"
diff --git a/regress/usr.bin/mandoc/eqn/Makefile.inc b/regress/usr.bin/mandoc/eqn/Makefile.inc
index 0f4095df114..3ec383c8aa8 100644
--- a/regress/usr.bin/mandoc/eqn/Makefile.inc
+++ b/regress/usr.bin/mandoc/eqn/Makefile.inc
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile.inc,v 1.1.1.1 2015/01/01 12:53:46 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2015/02/03 19:37:25 schwarze Exp $
EQN = /usr/local/bin/eqn
SKIP_GROFF ?= ${REGRESS_TARGETS}
-SKIP_TMAN ?= ALL SILENT
+SKIP_TMAN ?= ALL
_FULLHTMLFILES = ${HTML_TARGETS:S/$/.html/}
html-clean:
.if !empty(_FULLHTMLFILES)
- rm -f ${_HTMLFILES} ${_FULLHTMLFILES}
+ @rm -f ${_HTMLFILES} ${_FULLHTMLFILES}
.endif
.for t in ${HTML_TARGETS}
@@ -21,6 +21,5 @@ ${t}.out_html: ${t}.in
.include "../Makefile.inc"
.in.mandoc_html:
- ${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} > ${.TARGET:S/mandoc_html$/html/}
- @echo "extract.pl < ${.TARGET:S/mandoc_html$/html/} > ${.TARGET}"
+ @${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} > ${.TARGET:S/mandoc_html$/html/}
@${.CURDIR}/../extract.pl < ${.TARGET:S/mandoc_html$/html/} > ${.TARGET}
diff --git a/regress/usr.bin/mandoc/man/Makefile.inc b/regress/usr.bin/mandoc/man/Makefile.inc
index 60ec6449950..6b294ca9d13 100644
--- a/regress/usr.bin/mandoc/man/Makefile.inc
+++ b/regress/usr.bin/mandoc/man/Makefile.inc
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.2 2011/11/17 16:28:45 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2015/02/03 19:37:25 schwarze Exp $
-SKIP_TMAN?=ALL SILENT
+SKIP_TMAN ?= ALL
.include "../Makefile.inc"
diff --git a/regress/usr.bin/mandoc/roff/Makefile.inc b/regress/usr.bin/mandoc/roff/Makefile.inc
index b8f3a5f4768..6b294ca9d13 100644
--- a/regress/usr.bin/mandoc/roff/Makefile.inc
+++ b/regress/usr.bin/mandoc/roff/Makefile.inc
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile.inc,v 1.2 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2015/02/03 19:37:25 schwarze Exp $
-SKIP_TMAN?=ALL SILENT
+SKIP_TMAN ?= ALL
.include "../Makefile.inc"
diff --git a/regress/usr.bin/mandoc/roff/de/Makefile b/regress/usr.bin/mandoc/roff/de/Makefile
index 82a43f78885..b45237015c9 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.8 2015/01/07 12:19:17 schwarze Exp $
+# $OpenBSD: Makefile,v 1.9 2015/02/03 19:37:25 schwarze Exp $
REGRESS_TARGETS = append cond escname factorial indir startde TH Dd
LINT_TARGETS = escname indir
@@ -20,17 +20,17 @@ groff-clean: groff-clean-opt
# --- local rules ---
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
+ @${DIFF} ${.CURDIR}/TH.out_ascii_opt TH.mandoc_ascii_opt
+ @${DIFF} ${.CURDIR}/Dd.out_ascii_opt Dd.mandoc_ascii_opt
TH.mandoc_ascii_opt: TH.in
- ${MANDOC} -Tascii -man ${.ALLSRC} > ${.TARGET}
+ @${MANDOC} -Tascii -man ${.ALLSRC} > ${.TARGET}
Dd.mandoc_ascii_opt: Dd.in
- ${MANDOC} -Tascii -mdoc ${.ALLSRC} > ${.TARGET}
+ @${MANDOC} -Tascii -mdoc ${.ALLSRC} > ${.TARGET}
ascii-clean-opt:
- rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
+ @rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt
TH.out_ascii_opt: TH.in
/usr/local/bin/nroff -c -man -Tascii ${.ALLSRC} > ${.TARGET}
diff --git a/regress/usr.bin/mandoc/tbl/Makefile.inc b/regress/usr.bin/mandoc/tbl/Makefile.inc
index fb68716d7ce..e3a9bb9280f 100644
--- a/regress/usr.bin/mandoc/tbl/Makefile.inc
+++ b/regress/usr.bin/mandoc/tbl/Makefile.inc
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.1 2015/01/29 23:34:45 schwarze Exp $
+# $OpenBSD: Makefile.inc,v 1.2 2015/02/03 19:37:25 schwarze Exp $
TBL = /usr/local/bin/tbl
-SKIP_TMAN ?= ALL SILENT
+SKIP_TMAN ?= ALL
.for t in ${REGRESS_TARGETS}
${t}.out_ascii: ${t}.in