testcommon: spawn-aware system() and qx[] workalikes

[public-inbox.git] / t / hl_mod.t

diff --git a/t/hl_mod.t b/t/hl_mod.t
index fc7b712cea6945a4031274e63d0c05c6ed669e16..95057354636ab6461de622f80fe4fd03d09be927 100644 (file)
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -1,11 +1,15 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
+use PublicInbox::Spawn qw(which);
+use PublicInbox::TestCommon;
+use IO::Handle; # ->autoflush
+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 +25,16 @@ 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/&amp;&amp;/, 'escaped');
+       like($$ref, qr/&amp;&amp;/, '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;
-               my $cmd = [ qw(w3m -T text/html -dump -config /dev/null) ];
-               my ($out, $err) = ('', '');
-
-               # workaround https://bugs.debian.org/927409
-               $$ref =~ s/&apos;/&#39;/sg;
-
-               IPC::Run::run($cmd, \('<pre>'.$$ref.'</pre>'), \$out, \$err);
+       SKIP: {
+               my $w3m = which('w3m') or
+                       skip('w3m(1) missing to check output', 1);
+               my $cmd = [ $w3m, qw(-T text/html -dump -config /dev/null) ];
+               my $in = '<pre>' . $$ref . '</pre>';
+               my $out = xqx($cmd, undef, { 0 => \$in });
                # expand tabs and normalize whitespace,
                # w3m doesn't preserve tabs
                $orig =~ s/\t/        /gs;