Now that markdown output is tested for almost everything, test all

input files in -T markdown output mode by default and only mark
those files with SKIP_MARKDOWN that are not to be tested.
Much easier to read, and almost minus 40 lines of Makefile code.

diff --git a/regress/char/Makefile.inc b/regress/char/Makefile.inc
index 6b294ca9d1300f8699f87e708ffbae8ba854c057..9b05b274bafd37a26622c923af04251e948a62a5 100644 (file)
--- a/regress/char/Makefile.inc
+++ b/regress/char/Makefile.inc
@@ -1,5 +1,6 @@
 # $OpenBSD: Makefile.inc,v 1.3 2015/02/03 19:37:25 schwarze Exp $
 
 SKIP_TMAN ?= ALL
+SKIP_MARKDOWN ?= ALL
 
 .include "../Makefile.inc"

diff --git a/regress/eqn/Makefile.inc b/regress/eqn/Makefile.inc
index d7937db51461b7311c921bef998ad6b5e4c05e1c..d1d69f34c510d9f52d7f1d718bcd5fb7c6b1253f 100644 (file)
--- a/regress/eqn/Makefile.inc
+++ b/regress/eqn/Makefile.inc
@@ -4,6 +4,7 @@ EQN = /usr/local/bin/eqn
 
 SKIP_GROFF ?= ${REGRESS_TARGETS}
 SKIP_TMAN ?= ALL
+SKIP_MARKDOWN ?= ALL
 
 
 # OpenBSD only: maintainer targets and custom extraction

diff --git a/regress/man/Makefile.inc b/regress/man/Makefile.inc
index 6b294ca9d1300f8699f87e708ffbae8ba854c057..9b05b274bafd37a26622c923af04251e948a62a5 100644 (file)
--- a/regress/man/Makefile.inc
+++ b/regress/man/Makefile.inc
@@ -1,5 +1,6 @@
 # $OpenBSD: Makefile.inc,v 1.3 2015/02/03 19:37:25 schwarze Exp $
 
 SKIP_TMAN ?= ALL
+SKIP_MARKDOWN ?= ALL
 
 .include "../Makefile.inc"

diff --git a/regress/mdoc/Ad/Makefile b/regress/mdoc/Ad/Makefile
index 667257a2a662b06f8fab216ef0caed166d1d9adb..0e043ab244b59fa5a3d0f1da4eee4290a62fe463 100644 (file)
--- a/regress/mdoc/Ad/Makefile
+++ b/regress/mdoc/Ad/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = noarg font
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = noarg font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/An/Makefile b/regress/mdoc/An/Makefile
index da42571aaeca7695f5723958cf1de106a90dde04..b061bf761bf0166790d41cf421a4aa292c75449d 100644 (file)
--- a/regress/mdoc/An/Makefile
+++ b/regress/mdoc/An/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = break
 LINT_TARGETS   = break
-MARKDOWN_TARGETS = break
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Ap/Makefile b/regress/mdoc/Ap/Makefile
index f82cf7df5169c5adf2b6dc2dae318b27ddebdc87..4ee492534dcd047dc05d5a16d1bc747c095b7885 100644 (file)
--- a/regress/mdoc/Ap/Makefile
+++ b/regress/mdoc/Ap/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.2 2012/11/16 18:40:39 schwarze Exp $
 
 REGRESS_TARGETS = middle eos
-MARKDOWN_TARGETS = middle eos
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Aq/Makefile b/regress/mdoc/Aq/Makefile
index d0bcc85aa0038623f1ff7ddf64fa5ab4fbc051a8..ae347ad37d9fcf2ec52816fc7ea47e6d2ea7db1a 100644 (file)
--- a/regress/mdoc/Aq/Makefile
+++ b/regress/mdoc/Aq/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = author empty
 UTF8_TARGETS   = author empty
-MARKDOWN_TARGETS = author empty
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Ar/Makefile b/regress/mdoc/Ar/Makefile
index d7ea1681630ac77ad2ad9201c86a51e3ed4e93f6..2d1d895cb1f8b865eea27c73f412f985444143aa 100644 (file)
--- a/regress/mdoc/Ar/Makefile
+++ b/regress/mdoc/Ar/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.3 2012/07/09 17:52:09 schwarze Exp $
 
 REGRESS_TARGETS = punct font
-MARKDOWN_TARGETS = punct font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/At/Makefile b/regress/mdoc/At/Makefile
index 14baff1171597b7181e609719c22f55653eea3c0..6c3629959d320b058e5ee3f9df9f746fce047fc0 100644 (file)
--- a/regress/mdoc/At/Makefile
+++ b/regress/mdoc/At/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = invalid
 LINT_TARGETS   = invalid
-MARKDOWN_TARGETS = invalid
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Bd/Makefile b/regress/mdoc/Bd/Makefile
index c27fc8ac0841562344623227447d9ae43e3b857c..817d9fe71add87db1adf7b0cae549277adab2299 100644 (file)
--- a/regress/mdoc/Bd/Makefile
+++ b/regress/mdoc/Bd/Makefile
@@ -6,10 +6,6 @@ REGRESS_TARGETS        += break broken unclosed
 
 LINT_TARGETS    = beforeNAME blank nested badargs break broken unclosed
 
-MARKDOWN_TARGETS  = beforeNAME blank centered nested spacing
-MARKDOWN_TARGETS += badargs empty offset-empty offset-neg
-MARKDOWN_TARGETS += break broken unclosed
-
 SKIP_TMAN       = beforeNAME centered
 
 # groff-1.22.3 defects:

diff --git a/regress/mdoc/Bf/Makefile b/regress/mdoc/Bf/Makefile
index 799c8af91bd30a3bc92a51b4f8b92e7f784651b4..eb845e95ce813d49e44e750ebe673700b7aaf40c 100644 (file)
--- a/regress/mdoc/Bf/Makefile
+++ b/regress/mdoc/Bf/Makefile
@@ -3,6 +3,10 @@
 REGRESS_TARGETS        = nest multiargs badargs break broken
 LINT_TARGETS   = multiargs badargs break broken
 
+# mandoc -T markdown ignores .Bf, at least for now
+
+SKIP_MARKDOWN ?= ALL
+
 # groff-1.22.2 defects:
 #  - If the first argument to .Bf is a bad one,
 #    no block is opened at all and the .Ef causes another error.

diff --git a/regress/mdoc/Bk/Makefile b/regress/mdoc/Bk/Makefile
index cc3f2a7fda9d7c12057cea82702acddc3aee1b7f..bc82e0a4732828753b548739b34d563abcfb3548 100644 (file)
--- a/regress/mdoc/Bk/Makefile
+++ b/regress/mdoc/Bk/Makefile
@@ -5,4 +5,9 @@ LINT_TARGETS     = badarg broken
 
 SKIP_TMAN ?= badarg
 
+# mandoc -T markdown output of .Bk is quite ugly,
+# so refrain from testing it for now
+
+SKIP_MARKDOWN ?= ALL
+
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Bl/Makefile b/regress/mdoc/Bl/Makefile
index 0c2114cb088bc33743b6644a37fc8b8b609f29c7..01c45ed1575af6514eea595121cb11be1bcfec36 100644 (file)
--- a/regress/mdoc/Bl/Makefile
+++ b/regress/mdoc/Bl/Makefile
@@ -13,12 +13,6 @@ LINT_TARGETS  = column notype badargs tag
 LINT_TARGETS   += empty noIt emptyhead emptytag emptyitem
 LINT_TARGETS   += bareIt bareTa break breakingIt broken
 
-MARKDOWN_TARGETS  = item inset diag ohang bullet dash enum hang tag
-MARKDOWN_TARGETS += column colNoIt extend nested offset secstart
-MARKDOWN_TARGETS += notype multitype badargs
-MARKDOWN_TARGETS += empty noIt emptyhead emptytag emptyitem multitag
-MARKDOWN_TARGETS += bareIt bareTa unclosed breakingIt breakingTa broken
-
 # groff-mandoc differences:
 # - groff allows enclosures to span Ta, mandoc does not
 
@@ -46,4 +40,8 @@ SKIP_TMAN += tag
 
 SKIP_TMAN += emptyhead emptytag
 
+# mandoc -T markdown still has issues with badly nested lists
+
+SKIP_MARKDOWN ?= break
+
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Brq/Makefile b/regress/mdoc/Brq/Makefile
index d4c41e6e17dc5458e0cd22d085c7255b43605645..755b036aa30b18e3fb9d27728f50896bf6f774b3 100644 (file)
--- a/regress/mdoc/Brq/Makefile
+++ b/regress/mdoc/Brq/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2011/12/04 03:09:25 schwarze Exp $
 
 REGRESS_TARGETS  = empty
-MARKDOWN_TARGETS = empty
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Bx/Makefile b/regress/mdoc/Bx/Makefile
index 14c730dd5e7dcf5cb7b68b470e5da3f726a9ff0c..6d49f63a75464f18d70d29f89621feb43372154c 100644 (file)
--- a/regress/mdoc/Bx/Makefile
+++ b/regress/mdoc/Bx/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:45 schwarze Exp $
 
 REGRESS_TARGETS  = args
-MARKDOWN_TARGETS = args
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Cd/Makefile b/regress/mdoc/Cd/Makefile
index 0926221e8f462083caa21699d0dccfd9177f0f90..164e5964c717c64c0101658548e93c9e605e0357 100644 (file)
--- a/regress/mdoc/Cd/Makefile
+++ b/regress/mdoc/Cd/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg font eos
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = noarg font eos
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Cm/Makefile b/regress/mdoc/Cm/Makefile
index aa181eab3c4602db90888e76efa412bcc4adcdfb..e674e7562db6b846e8fe10dc1ebdf6d8767adb59 100644 (file)
--- a/regress/mdoc/Cm/Makefile
+++ b/regress/mdoc/Cm/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = basic font noarg
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = basic font noarg
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/D1/Makefile b/regress/mdoc/D1/Makefile
index 047c39bd653e5b6dee1c8053c8ed021868836c84..bed27d1b1f1abae30cb8eb2d1f0d5af9e635d4a6 100644 (file)
--- a/regress/mdoc/D1/Makefile
+++ b/regress/mdoc/D1/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS         = spacing
 LINT_TARGETS    = spacing
-MARKDOWN_TARGETS = spacing
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Db/Makefile b/regress/mdoc/Db/Makefile
index c37822ff2842252342e26748020e9877ddd3c15c..f2a4a5b279b4f03a7f74e4af6533cd541cd5fe81 100644 (file)
--- a/regress/mdoc/Db/Makefile
+++ b/regress/mdoc/Db/Makefile
@@ -3,4 +3,8 @@
 REGRESS_TARGETS        = args
 LINT_TARGETS   = args
 
+# mandoc -T markdown ignores .Db
+
+SKIP_MARKDOWN ?= ALL
+
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Dd/Makefile b/regress/mdoc/Dd/Makefile
index 396b268d7c54937ea202ec8e2a57fdd8fcd03c3e..870d1cd9c99d99f8cdc89bce0bef42332dace71a 100644 (file)
--- a/regress/mdoc/Dd/Makefile
+++ b/regress/mdoc/Dd/Makefile
@@ -2,7 +2,11 @@
 
 REGRESS_TARGETS         = badarg dupe late long manarg noarg order
 LINT_TARGETS    = badarg dupe late long manarg noarg order
-MARKDOWN_TARGETS = badarg dupe late long manarg order
+
+# noarg output contains the date when the file is formatted
+
+SKIP_ASCII     ?= noarg
+SKIP_MARKDOWN  ?= noarg
 
 # If groff finds exactly three arguments, it assumes they are month,
 # day and year without further checking.  If there are no arguments,
@@ -11,7 +15,6 @@ MARKDOWN_TARGETS = badarg dupe late long manarg order
 # That is not at all sane behaviour, we are not going to imitate it.
 
 SKIP_GROFF      = badarg long manarg noarg
-SKIP_ASCII      = noarg
 
 # Autodetection fails for late .Dd, so specify -mdoc explicitly.
 

diff --git a/regress/mdoc/Dl/Makefile b/regress/mdoc/Dl/Makefile
index 047c39bd653e5b6dee1c8053c8ed021868836c84..bed27d1b1f1abae30cb8eb2d1f0d5af9e635d4a6 100644 (file)
--- a/regress/mdoc/Dl/Makefile
+++ b/regress/mdoc/Dl/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS         = spacing
 LINT_TARGETS    = spacing
-MARKDOWN_TARGETS = spacing
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Dq/Makefile b/regress/mdoc/Dq/Makefile
index d4c41e6e17dc5458e0cd22d085c7255b43605645..755b036aa30b18e3fb9d27728f50896bf6f774b3 100644 (file)
--- a/regress/mdoc/Dq/Makefile
+++ b/regress/mdoc/Dq/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2011/12/04 03:09:25 schwarze Exp $
 
 REGRESS_TARGETS  = empty
-MARKDOWN_TARGETS = empty
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Dt/Makefile b/regress/mdoc/Dt/Makefile
index 2c896aa3a388985e7ed98a5717a48aa30c0ed4f6..6678d7fb0937461ee4cced2f2a5dc375cf7e5b03 100644 (file)
--- a/regress/mdoc/Dt/Makefile
+++ b/regress/mdoc/Dt/Makefile
@@ -4,11 +4,10 @@ REGRESS_TARGETS        = badsec case dupe fourargs late
 REGRESS_TARGETS        += missing noarg nobody nosec order
 LINT_TARGETS    = badsec case dupe fourargs late
 LINT_TARGETS   += missing noarg nobody nosec order
-MARKDOWN_TARGETS  = case dupe fourargs late
-MARKDOWN_TARGETS += missing noarg nobody nosec order
 
 SKIP_GROFF      = badsec nobody
 SKIP_ASCII      = badsec
+SKIP_MARKDOWN  ?= badsec
 
 # When the section is missing from the man(7) .TH title line,
 # empty parentheses are shown in the page header.

diff --git a/regress/mdoc/Dv/Makefile b/regress/mdoc/Dv/Makefile
index 9fa35934ae18cd8fcbcd43f501df23b42cc10d4b..cfe3ad0b4b2312ac6dd6103c019daaeb875ae603 100644 (file)
--- a/regress/mdoc/Dv/Makefile
+++ b/regress/mdoc/Dv/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = font noarg
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = font noarg
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Em/Makefile b/regress/mdoc/Em/Makefile
index b10c9d95402b6f6ff99faf22d862f89513762304..13de4337a2048074a88e5318a2fc7515db0c9e64 100644 (file)
--- a/regress/mdoc/Em/Makefile
+++ b/regress/mdoc/Em/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = font noarg punct
 LINT_TARGETS   = noarg punct
-MARKDOWN_TARGETS = font noarg punct
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Eo/Makefile b/regress/mdoc/Eo/Makefile
index 6fa9d8430b370ca6c7bd8a99153c24e429203292..0034e271182fc3f71174bdf762203c4a93db7823 100644 (file)
--- a/regress/mdoc/Eo/Makefile
+++ b/regress/mdoc/Eo/Makefile
@@ -2,7 +2,6 @@
 
 REGRESS_TARGETS         = break empty obsolete unclosed
 LINT_TARGETS    = break obsolete unclosed
-MARKDOWN_TARGETS = break empty obsolete unclosed
 
 # groff-1.22.3 defect:
 # - When .Ec is missing, groff prints no page footer.

diff --git a/regress/mdoc/Er/Makefile b/regress/mdoc/Er/Makefile
index e13130c15f75c0ce7dc2e32f447752c69f3edae6..1be2a84aeb4ec5940b0b28f617f249ef7e8f80d6 100644 (file)
--- a/regress/mdoc/Er/Makefile
+++ b/regress/mdoc/Er/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg font
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = noarg font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Ev/Makefile b/regress/mdoc/Ev/Makefile
index 9fa35934ae18cd8fcbcd43f501df23b42cc10d4b..cfe3ad0b4b2312ac6dd6103c019daaeb875ae603 100644 (file)
--- a/regress/mdoc/Ev/Makefile
+++ b/regress/mdoc/Ev/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = font noarg
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = font noarg
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Ex/Makefile b/regress/mdoc/Ex/Makefile
index af31cf786a6a57febacf711756a2aca68fe3cf87..8a714ce124e2c015db46da971e963d3754c94965 100644 (file)
--- a/regress/mdoc/Ex/Makefile
+++ b/regress/mdoc/Ex/Makefile
@@ -2,7 +2,6 @@
 
 REGRESS_TARGETS         = args noname nostd
 LINT_TARGETS    = noname nostd
-MARKDOWN_TARGETS = args noname nostd
 
 # groff-1.22.2 defect:
 # - .Ex without -std produces no output

diff --git a/regress/mdoc/Fd/Makefile b/regress/mdoc/Fd/Makefile
index 9c1206096d5f25d7924050a6793073a9292a0bc6..7cd78c65b86181957d09346011b77a750841d95a 100644 (file)
--- a/regress/mdoc/Fd/Makefile
+++ b/regress/mdoc/Fd/Makefile
@@ -3,6 +3,5 @@
 REGRESS_TARGETS         = break empty eos font
 LINT_TARGETS    = empty
 SKIP_TMAN       = eos
-MARKDOWN_TARGETS = break empty eos font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Fl/Makefile b/regress/mdoc/Fl/Makefile
index df24f7c0aace1dc365e92722ac56d0094dbbe12e..e9e01a192cdabb397e0a01f64c7b4963b53994c0 100644 (file)
--- a/regress/mdoc/Fl/Makefile
+++ b/regress/mdoc/Fl/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.8 2014/08/21 12:56:24 schwarze Exp $
 
 REGRESS_TARGETS = noarg multiarg parsed punct font
-MARKDOWN_TARGETS = noarg multiarg parsed punct font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Fo/Makefile b/regress/mdoc/Fo/Makefile
index f4458b9cbc23ac2a0d462ef169825836c474a515..71242c8e45668889b3edc12007f7fd7c92d21eb6 100644 (file)
--- a/regress/mdoc/Fo/Makefile
+++ b/regress/mdoc/Fo/Makefile
@@ -3,8 +3,6 @@
 REGRESS_TARGETS         = basic break eos font noarg nohead
 REGRESS_TARGETS += obsolete punct section warn
 LINT_TARGETS    = noarg nohead obsolete warn
-MARKDOWN_TARGETS  = basic break eos font noarg nohead
-MARKDOWN_TARGETS += obsolete punct section warn
 
 # groff-1.22.3 defects:
 # - .Fo without an argument prints unbalanced parentheses

diff --git a/regress/mdoc/Ft/Makefile b/regress/mdoc/Ft/Makefile
index f1ebeedf7d7fd50fcab38e5077548c8dcc401cb2..915e456c3544e89a146f33f656cafaf71d4c1ffa 100644 (file)
--- a/regress/mdoc/Ft/Makefile
+++ b/regress/mdoc/Ft/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.1 2012/07/09 17:52:09 schwarze Exp $
 
 REGRESS_TARGETS = font
-MARKDOWN_TARGETS = font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Ic/Makefile b/regress/mdoc/Ic/Makefile
index e13130c15f75c0ce7dc2e32f447752c69f3edae6..1be2a84aeb4ec5940b0b28f617f249ef7e8f80d6 100644 (file)
--- a/regress/mdoc/Ic/Makefile
+++ b/regress/mdoc/Ic/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg font
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = noarg font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/In/Makefile b/regress/mdoc/In/Makefile
index 9c92ccf40377172477bc0f50ecc033d4232696ea..790827bbcfa57de33e864888186be4d26f3a4d4e 100644 (file)
--- a/regress/mdoc/In/Makefile
+++ b/regress/mdoc/In/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS         = break eos font noarg
 LINT_TARGETS    = noarg
-MARKDOWN_TARGETS = break eos font noarg
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Lb/Makefile b/regress/mdoc/Lb/Makefile
index 4fae0494f3a7c51346a7b2af992378f2c00001fe..952e0881d6a6a257e275487e221b22365496e29c 100644 (file)
--- a/regress/mdoc/Lb/Makefile
+++ b/regress/mdoc/Lb/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = break badargs eos
 LINT_TARGETS   = badargs
-MARKDOWN_TARGETS = break badargs eos
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Li/Makefile b/regress/mdoc/Li/Makefile
index 1e1a4b931d82dcfd0f4390b0f015f2e5fe09ea02..f5afd19956d7efadba072297d1addd4e65fef7b6 100644 (file)
--- a/regress/mdoc/Li/Makefile
+++ b/regress/mdoc/Li/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = punct font
 LINT_TARGETS   = punct
-MARKDOWN_TARGETS = punct font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Lk/Makefile b/regress/mdoc/Lk/Makefile
index cb4ead51700355c4a44fb68ca5d3a4a02ae10995..448b1c4fabfcdf55eb4a96156d957acfdfbd6ddb 100644 (file)
--- a/regress/mdoc/Lk/Makefile
+++ b/regress/mdoc/Lk/Makefile
@@ -2,6 +2,9 @@
 
 REGRESS_TARGETS = link noarg font
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = link noarg
+
+# it's unclear what font changes in link destinations should do
+
+SKIP_MARKDOWN  ?= font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Ms/Makefile b/regress/mdoc/Ms/Makefile
index e13130c15f75c0ce7dc2e32f447752c69f3edae6..1be2a84aeb4ec5940b0b28f617f249ef7e8f80d6 100644 (file)
--- a/regress/mdoc/Ms/Makefile
+++ b/regress/mdoc/Ms/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = noarg font
 LINT_TARGETS   = noarg
-MARKDOWN_TARGETS = noarg font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Mt/Makefile b/regress/mdoc/Mt/Makefile
index b1dfaa90d0cce6454e2cd9183e9fbff4ee8e7cdc..fbeff8b92109b6ebbf3c2e746dd8ff642cbb92df 100644 (file)
--- a/regress/mdoc/Mt/Makefile
+++ b/regress/mdoc/Mt/Makefile
@@ -1,6 +1,9 @@
 # $OpenBSD: Makefile,v 1.5 2012/07/09 17:52:09 schwarze Exp $
 
 REGRESS_TARGETS = simple font
-MARKDOWN_TARGETS = simple
+
+# it's unclear what font changes in link destinations should do
+
+SKIP_MARKDOWN ?= font
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Nd/Makefile b/regress/mdoc/Nd/Makefile
index d2f6e4b8fee4bf583638de36c25f79d5fcdc91bc..06a09a7a44ea379cb6d4adcf4f2e11d7c6bee6ab 100644 (file)
--- a/regress/mdoc/Nd/Makefile
+++ b/regress/mdoc/Nd/Makefile
@@ -2,6 +2,7 @@
 
 REGRESS_TARGETS         = broken hyph noarg par
 LINT_TARGETS    = broken noarg
-MARKDOWN_TARGETS = hyph noarg par
+
+SKIP_MARKDOWN  ?= broken
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Nm/Makefile b/regress/mdoc/Nm/Makefile
index 515f9e5d6610ce65f70e623be0e5c00a67e4f1c2..136d744d8f44b9307cc3aec71440753111a62b93 100644 (file)
--- a/regress/mdoc/Nm/Makefile
+++ b/regress/mdoc/Nm/Makefile
@@ -6,9 +6,6 @@ REGRESS_TARGETS += font long par parns punct
 
 LINT_TARGETS    = badNAME badNAMEuse break broken
 
-MARKDOWN_TARGETS  = break broken empty
-MARKDOWN_TARGETS += font long par parns punct
-
 # groff-1.22.3/mandoc differences:
 # - When the head of an Nm block in the SYNOPSIS is broken by an
 #   explicit block end macro on the same line, formatting differs,
@@ -24,4 +21,6 @@ SKIP_TMAN      = broken par parns
 
 SKIP_GROFF     += break
 
+SKIP_MARKDOWN  ?= badNAME badNAMEuse emptyNAME emptyNAMEuse
+
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/No/Makefile b/regress/mdoc/No/Makefile
index 886130797705ee7afbffef65174fa02b22fd2c42..3110bf2b06d6963c258d58514d554c674a50d6f0 100644 (file)
--- a/regress/mdoc/No/Makefile
+++ b/regress/mdoc/No/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS = punct spacing
 LINT_TARGETS   = punct
-MARKDOWN_TARGETS = punct spacing
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Ns/Makefile b/regress/mdoc/Ns/Makefile
index ea798c05ddf60054514160c17d4d6b44ede2e5db..45db66cc5ebc1cd43863cbf271fc2663ea5d45b9 100644 (file)
--- a/regress/mdoc/Ns/Makefile
+++ b/regress/mdoc/Ns/Makefile
@@ -2,6 +2,5 @@
 
 REGRESS_TARGETS        = position punct
 LINT_TARGETS   = position
-MARKDOWN_TARGETS = position punct
 
 .include <bsd.regress.mk>

diff --git a/regress/mdoc/Oo/Makefile b/regress/mdoc/Oo/Makefile
index 06f0dec804de56618e507b784d1525114837e4b4..67bf2449a5e0386c17869ff30910369cbcaa0f76 100644 (file)
--- a/regress/mdoc/Oo/Makefile
+++ b/regress/mdoc/Oo/Makefile
@@ -1,6 +1,5 @@
 # $OpenBSD: Makefile,v 1.1 2012/07/07 14:10:55 schwarze Exp $
 
 REGRESS_TARGETS  = punct
-MARKDOWN_TARGETS = punct
 
 .include <bsd.regress.mk>

diff --git a/regress/regress.pl b/regress/regress.pl
index d7abf650e793f1a2c6622628ad8f45262a327a8d..c49743d5819999dccf21743ec4b11a726dbbc6d3 100755 (executable)
--- a/regress/regress.pl
+++ b/regress/regress.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $Id: regress.pl,v 1.4 2017/03/05 19:57:39 schwarze Exp $
+# $Id: regress.pl,v 1.5 2017/03/08 22:54:22 schwarze Exp $
 #
 # Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -163,7 +163,7 @@ my @mandoc = '../mandoc';
 my @subdir_names;
 my (@regress_testnames, @utf8_testnames, @lint_testnames);
 my (@html_testnames, @markdown_testnames);
-my (%skip_ascii, %skip_man);
+my (%skip_ascii, %skip_man, %skip_markdown);
 
 push @mandoc, split ' ', $vars{MOPTS} if $vars{MOPTS};
 delete $vars{MOPTS};
@@ -206,12 +206,17 @@ if (defined $vars{SKIP_TMAN}) {
        $skip_man{$_} = 1 for split ' ', $vars{SKIP_TMAN};
        delete $vars{SKIP_TMAN};
 }
+if (defined $vars{SKIP_MARKDOWN}) {
+       $skip_markdown{$_} = 1 for split ' ', $vars{SKIP_MARKDOWN};
+       delete $vars{SKIP_MARKDOWN};
+}
 if (keys %vars) {
        my @vars = keys %vars;
        die "unknown var(s) @vars";
 }
 map { $skip_ascii{$_} = 1; } @regress_testnames if $skip_ascii{ALL};
 map { $skip_man{$_} = 1; } @regress_testnames if $skip_man{ALL};
+map { $skip_markdown{$_} = 1; } @regress_testnames if $skip_markdown{ALL};
 
 # --- run targets ------------------------------------------------------
 
@@ -307,12 +312,12 @@ for my $testname (@html_testnames) {
 }
 
 my $count_markdown = 0;
-for my $testname (@markdown_testnames) {
+for my $testname (@regress_testnames) {
        next if $onlytest && $testname ne $onlytest;
        my $i = "$subdir/$testname.in";
        my $o = "$subdir/$testname.mandoc_markdown";
        my $w = "$subdir/$testname.out_markdown";
-       if ($targets{markdown}) {
+       if ($targets{markdown} && !$skip_markdown{$testname}) {
                $count_markdown++;
                $count_total++;
                print "@mandoc -T markdown $i\n" if $targets{verbose};