X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhl_mod.t;h=95057354636ab6461de622f80fe4fd03d09be927;hb=256b3566e4d57a64bb349a7b896da10381a2a363;hp=4942404c9e1b22a3b4ee50e6763d0887aeb441c1;hpb=1709921529d4024e241ec64b86a5d408333f667e;p=public-inbox.git
diff --git a/t/hl_mod.t b/t/hl_mod.t
index 4942404c..95057354 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -1,10 +1,12 @@
#!/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 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 for $0";
@@ -28,21 +30,14 @@ my $orig = $str;
is($$ref, $$lref, 'do_hl_lang matches do_hl');
SKIP: {
- which('w3m') or skip 'w3m(1) missing to check output', 1;
- my $cmd = [ qw(w3m -T text/html -dump -config /dev/null) ];
- 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);
+ 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;
- $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');