===================================================================
RCS file: /cvs/mandoc/regress/regress.pl,v
retrieving revision 1.11
retrieving revision 1.13
diff -u -p -r1.11 -r1.13
--- mandoc/regress/regress.pl	2019/07/01 22:56:26	1.11
+++ mandoc/regress/regress.pl	2020/01/08 10:37:53	1.13
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $Id: regress.pl,v 1.11 2019/07/01 22:56:26 schwarze Exp $
+# $Id: regress.pl,v 1.13 2020/01/08 10:37:53 schwarze Exp $
 #
 # Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -86,8 +86,12 @@ sub syshtml ($@) {
 		if (!$state && s/.*<math class="eqn">//) {
 			$state = 'math';
 			next unless length;
-		} elsif (/^BEGINTEST/) {
+		} elsif (/BEGINTEST/) {
 			$state = 'other';
+			next;
+		} elsif (/ENDTEST/) {
+			$state = 0;
+			next;
 		}
 		if ($state eq 'math') {
 			s/^ *//;
@@ -98,7 +102,6 @@ sub syshtml ($@) {
 			}
 		}
 		print $outfd "$_\n" if $state;
-		$state = 0 if /^ENDTEST/;
 	}
 	close $outfd;
 	close $infd;
@@ -162,10 +165,9 @@ foreach my $module (qw(roff char mdoc man tbl eqn)) {
 		my %subvars = (MOPTS => '');
 		parse_makefile "$module/$subdir/Makefile", \%subvars;
 		parse_makefile "$module/Makefile.inc", \%subvars;
+		delete $subvars{GOPTS};
 		delete $subvars{SKIP_GROFF};
 		delete $subvars{SKIP_GROFF_ASCII};
-		delete $subvars{TBL};
-		delete $subvars{EQN};
 		my @mandoc = ('../mandoc', split ' ', $subvars{MOPTS});
 		delete $subvars{MOPTS};
 		my @regress_testnames;