X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhl_mod.t;h=a4ef4a284dda689f7c06330147037633b6c513c0;hb=2fc67a18b7ccd75ea6eb945f18203cbf4bcf228f;hp=fc7b712cea6945a4031274e63d0c05c6ed669e16;hpb=d88d992927467a9d5bc2733cc01e3dda4c5de234;p=public-inbox.git
diff --git a/t/hl_mod.t b/t/hl_mod.t
index fc7b712c..a4ef4a28 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -1,11 +1,14 @@
#!/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 spawn);
+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,23 +24,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) = ('', '');
-
- # workaround https://bugs.debian.org/927409
- $$ref =~ s/'/'/sg;
-
- 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');