X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhl_mod.t;h=a88f6c0372bd2d1fcbbc0cd5bba482b3c22b37c5;hb=10e0e2052b2c2a4bb405cfbb4c2c72464671152d;hp=f5bf433db1375eceb122ada7c8b96afa2b41d957;hpb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;p=public-inbox.git
diff --git a/t/hl_mod.t b/t/hl_mod.t
index f5bf433d..a88f6c03 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -1,22 +1,16 @@
#!/usr/bin/perl -w
# Copyright (C) 2019-2021 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 strict; use v5.10.1; 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";
+require_mods 'highlight';
use_ok 'PublicInbox::HlMod';
my $hls = PublicInbox::HlMod->new;
ok($hls, 'initialized OK');
is($hls->_shebang2lang(\"#!/usr/bin/perl -w\n"), 'perl', 'perl shebang OK');
is($hls->{-ext2lang}->{'pm'}, 'perl', '.pm suffix OK');
is($hls->{-ext2lang}->{'pl'}, 'perl', '.pl suffix OK');
-is($hls->_path2lang('Makefile'), 'make', 'Makefile OK');
+like($hls->_path2lang('Makefile'), qr/\Amake/, 'Makefile OK');
my $str = do { local $/; open(my $fh, __FILE__); <$fh> };
my $orig = $str;
@@ -30,7 +24,7 @@ my $orig = $str;
is($$ref, $$lref, 'do_hl_lang matches do_hl');
SKIP: {
- my $w3m = which('w3m') or
+ my $w3m = require_cmd('w3m', 1) or
skip('w3m(1) missing to check output', 1);
my $cmd = [ $w3m, qw(-T text/html -dump -config /dev/null) ];
my $in = '' . $$ref . '
';