X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fhl_mod.t;h=96878d5191dfa29197ebb8dc616c3a6a2c17b196;hb=3596019278ef489f27e0659c752977f60f847903;hp=95057354636ab6461de622f80fe4fd03d09be927;hpb=6e07def560b211d9a1a3221862e72b7aeb4a31b3;p=public-inbox.git

diff --git a/t/hl_mod.t b/t/hl_mod.t
index 95057354..96878d51 100644
--- a/t/hl_mod.t
+++ b/t/hl_mod.t
@@ -1,12 +1,7 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
-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";
@@ -16,7 +11,7 @@ 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 +25,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 = '<pre>' . $$ref . '</pre>';