===================================================================
RCS file: /cvs/mandoc/regress/regress.pl,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- mandoc/regress/regress.pl	2020/03/13 15:32:31	1.14
+++ mandoc/regress/regress.pl	2021/09/19 12:15:34	1.16
@@ -1,8 +1,8 @@
 #!/usr/bin/env perl
 #
-# $Id: regress.pl,v 1.14 2020/03/13 15:32:31 schwarze Exp $
+# $Id: regress.pl,v 1.16 2021/09/19 12:15:34 schwarze Exp $
 #
-# Copyright (c) 2017, 2018, 2019, 2020 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2017,2018,2019,2020,2021 Ingo Schwarze <schwarze@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -261,19 +261,21 @@ for my $test (@regress_tests) {
 	my $o = "$test->{NAME}.mandoc_ascii";
 	my $w = "$test->{NAME}.out_ascii";
 	my $to = "$test->{NAME}.mandoc_tag";
+	my $tos = "$test->{NAME}.mandoc_tag_s";
 	my $tw = "$test->{NAME}.out_tag";
 	my $diff_ascii;
 	if ($targets{tag} && $tag_tests{$test->{NAME}} &&
 	    $test->{NAME} =~ /^$onlytest/) {
 		$count_tag++;
 		$count_total++;
-		local $ENV{MANPAGER} = "./copyless $test->{NAME}";
 		my @cmd = (qw(../man -l), @{$test->{MOPTS}},
-		    qw(-I os=OpenBSD -T ascii), $i);
+		    qw(-I os=OpenBSD -T ascii -O),
+		    "outfilename=$o,tagfilename=$to", "$i");
 		print "@cmd\n" if $targets{verbose};
 		system @cmd
 		    and fail $test->{NAME}, 'tag:man';
-		system @diff, $tw, $to
+		system "sed 's: .*/: :' $to > $tos";
+		system @diff, $tw, $tos
 		    and fail $test->{NAME}, 'tag:diff';
 		print "." unless $targets{verbose};
 		$diff_ascii = $targets{ascii};
@@ -308,8 +310,8 @@ for my $test (@regress_tests) {
 		print "." unless $targets{verbose};
 	}
 	if ($targets{clean}) {
-		print "rm $o $to $m $mo\n" if $targets{verbose};
-		$count_rm += unlink $o, $to, $m, $mo;
+		print "rm $o $to $tos $m $mo\n" if $targets{verbose};
+		$count_rm += unlink $o, $to, $tos, $m, $mo;
 	}
 }
 if ($targets{ascii} || $targets{tag} || $targets{man}) {