diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2017-03-08 22:54:22 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-03-08 22:54:22 +0000 |
commit | eb74e0f0e616a89f769432b7f4c31856c1a37f49 (patch) | |
tree | fab71235e5595f9027cea5153f6d0f3dd6de3c0e /regress | |
parent | aed548e3b22772365ac5fdaf6cdb29f7b2b1b126 (diff) | |
download | mandoc-eb74e0f0e616a89f769432b7f4c31856c1a37f49.tar.gz |
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.
Diffstat (limited to 'regress')
46 files changed, 46 insertions, 55 deletions
diff --git a/regress/char/Makefile.inc b/regress/char/Makefile.inc index 6b294ca9..9b05b274 100644 --- 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 d7937db5..d1d69f34 100644 --- 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 6b294ca9..9b05b274 100644 --- 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 667257a2..0e043ab2 100644 --- 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 da42571a..b061bf76 100644 --- 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 f82cf7df..4ee49253 100644 --- 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 d0bcc85a..ae347ad3 100644 --- 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 d7ea1681..2d1d895c 100644 --- 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 14baff11..6c362995 100644 --- 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 c27fc8ac..817d9fe7 100644 --- 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 799c8af9..eb845e95 100644 --- 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 cc3f2a7f..bc82e0a4 100644 --- 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 0c2114cb..01c45ed1 100644 --- 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 d4c41e6e..755b036a 100644 --- 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 14c730dd..6d49f63a 100644 --- 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 0926221e..164e5964 100644 --- 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 aa181eab..e674e756 100644 --- 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 047c39bd..bed27d1b 100644 --- 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 c37822ff..f2a4a5b2 100644 --- 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 396b268d..870d1cd9 100644 --- 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 047c39bd..bed27d1b 100644 --- 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 d4c41e6e..755b036a 100644 --- 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 2c896aa3..6678d7fb 100644 --- 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 9fa35934..cfe3ad0b 100644 --- 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 b10c9d95..13de4337 100644 --- 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 6fa9d843..0034e271 100644 --- 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 e13130c1..1be2a84a 100644 --- 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 9fa35934..cfe3ad0b 100644 --- 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 af31cf78..8a714ce1 100644 --- 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 9c120609..7cd78c65 100644 --- 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 df24f7c0..e9e01a19 100644 --- 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 f4458b9c..71242c8e 100644 --- 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 f1ebeedf..915e456c 100644 --- 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 e13130c1..1be2a84a 100644 --- 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 9c92ccf4..790827bb 100644 --- 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 4fae0494..952e0881 100644 --- 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 1e1a4b93..f5afd199 100644 --- 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 cb4ead51..448b1c4f 100644 --- 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 e13130c1..1be2a84a 100644 --- 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 b1dfaa90..fbeff8b9 100644 --- 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 d2f6e4b8..06a09a7a 100644 --- 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 515f9e5d..136d744d 100644 --- 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 88613079..3110bf2b 100644 --- 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 ea798c05..45db66cc 100644 --- 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 06f0dec8..67bf2449 100644 --- 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 9ebbdf5e..ce384b52 100755 --- a/regress/regress.pl +++ b/regress/regress.pl @@ -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}; |