From 1709921529d4024e241ec64b86a5d408333f667e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 4 Nov 2019 03:01:36 +0000 Subject: t/hl_mod.t: remove IPC::Run (and File::Temp) dependency We already load PublicInbox::Spawn for which(), so using spawn() isn't unreasonable. And rely on "skip" to log the omitted test if w3m is missing, which means we need to update the "&&" escaping test to be self-referential on the same line. File::Temp was totally unused, there; and we can use "open ...,undef" in Perl to easily create anonymous temporary files for use with spawn(). --- t/hl_mod.t | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/t/hl_mod.t b/t/hl_mod.t index 52ef39dc..4942404c 100644 --- a/t/hl_mod.t +++ b/t/hl_mod.t @@ -4,8 +4,10 @@ use strict; use warnings; use Test::More; +use PublicInbox::Spawn qw(which spawn); +use Fcntl qw(:seek); eval { require highlight } or - plan skip_all => 'failed to load highlight.pm'; + plan skip_all => "failed to load highlight.pm for $0"; use_ok 'PublicInbox::HlMod'; my $hls = PublicInbox::HlMod->new; ok($hls, 'initialized OK'); @@ -21,20 +23,26 @@ my $orig = $str; is(ref($ref), 'SCALAR', 'got a scalar reference back'); ok(utf8::valid($$ref), 'resulting string is utf8::valid'); like($$ref, qr/I can see you!/, 'we can see ourselves in output'); - like($$ref, qr/&&/, 'escaped'); + like($$ref, qr/&&/, 'escaped &&'); my $lref = $hls->do_hl_lang(\$str, 'perl'); is($$ref, $$lref, 'do_hl_lang matches do_hl'); - use PublicInbox::Spawn qw(which); - if (eval { require IPC::Run } && which('w3m')) { - require File::Temp; + SKIP: { + which('w3m') or skip 'w3m(1) missing to check output', 1; my $cmd = [ qw(w3m -T text/html -dump -config /dev/null) ]; - my ($out, $err) = ('', ''); - - IPC::Run::run($cmd, \('
'.$$ref.'
'), \$out, \$err); + open my $in, '+>', undef or die; + open my $out, '+>', undef or die; + my $rdr = { 0 => fileno($in), 1 => fileno($out) }; + $in->autoflush(1); + print $in '
', $$ref, '
' or die; + $in->seek(0, SEEK_SET) or die; + my $pid = spawn($cmd, undef, $rdr); + waitpid($pid, 0); # expand tabs and normalize whitespace, # w3m doesn't preserve tabs $orig =~ s/\t/ /gs; + $out->seek(0, SEEK_SET) or die; + $out = do { local $/; <$out> }; $out =~ s/\s*\z//sg; $orig =~ s/\s*\z//sg; is($out, $orig, 'w3m output matches'); -- cgit v1.2.3-24-ge0c7