X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhl_mod.t;h=95057354636ab6461de622f80fe4fd03d09be927;hb=03c9119ec613fa43dcf0a50b5f35754f13228bc8;hp=84a4b5766873ba733041c87819450bbfa9dc3fc5;hpb=7826c91ef37f9b5fb5396e1168d84a6574385915;p=public-inbox.git
diff --git a/t/hl_mod.t b/t/hl_mod.t
index 84a4b576..95057354 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -1,11 +1,15 @@
#!/usr/bin/perl -w
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# License: AGPL-3.0+
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,16 +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/&&/, '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;
- my $cmd = [ qw(w3m -T text/html -dump -config /dev/null) ];
- my ($out, $err) = ('', '');
- IPC::Run::run($cmd, \(''.$$ref.'
'), \$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 = '' . $$ref . '
';
+ my $out = xqx($cmd, undef, { 0 => \$in });
# expand tabs and normalize whitespace,
# w3m doesn't preserve tabs
$orig =~ s/\t/ /gs;