X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhl_mod.t;h=95057354636ab6461de622f80fe4fd03d09be927;hb=a43ca1d19f3b748d6abd62c9ce8b159f1255edfb;hp=351dfe225c12204ae4e36bb6478ab94d1e7e688d;hpb=dd694f1c3797ce0ca7a4748a97f8af536ef21c2e;p=public-inbox.git diff --git a/t/hl_mod.t b/t/hl_mod.t index 351dfe22..95057354 100644 --- a/t/hl_mod.t +++ b/t/hl_mod.t @@ -1,10 +1,11 @@ #!/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 @@ -29,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');