adjust test framework to not require a tty

2 files changed, 4 insertions, 17 deletions

diff --git a/regress/copyless b/regress/copyless
deleted file mode 100755
index a00c0009..00000000
--- a/regress/copyless
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-set -e
-umask 022
-if [ "$#" -ne 4 ]; then
-	echo "$0 $*: $# args instead of 4" 1>&2
-	exit 1
-fi
-if [ "$2" != "-T" ]; then
-	echo "$0 $*: second arg is not -T" 1>&2
-	exit 1
-fi
-cut -d ' ' -f 1,3 "$3" > "$1.mandoc_tag"
-cp "$4" "$1.mandoc_ascii"
-exit 0
diff --git a/regress/regress.pl b/regress/regress.pl
index 3c6e64df..fc320c07 100755
--- a/regress/regress.pl
+++ b/regress/regress.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $Id: regress.pl,v 1.14 2020/03/13 15:32:31 schwarze Exp $
+# $Id: regress.pl,v 1.15 2020/07/21 15:14:20 schwarze Exp $
 #
 # Copyright (c) 2017, 2018, 2019, 2020 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -267,12 +267,13 @@ for my $test (@regress_tests) {
 	    $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 qw(sed -i), 's/ .*\// /', $to;
 		system @diff, $tw, $to
 		    and fail $test->{NAME}, 'tag:diff';
 		print "." unless $targets{verbose};