From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] t/httpd-corner: use which() sub for detecting curl(1)
Date: Sun, 15 Sep 2019 00:47:25 +0000 [thread overview]
Message-ID: <20190915004725.19463-1-e@80x24.org> (raw)
We already import `which' for lsof(8), so we might as well
use it to detect curl(1), too.
---
t/httpd-corner.t | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index af838628..f5937e76 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -6,6 +6,7 @@ use strict;
use warnings;
use Test::More;
use Time::HiRes qw(gettimeofday tv_interval);
+use PublicInbox::Spawn qw(which);
foreach my $mod (qw(Plack::Util Plack::Builder
HTTP::Date HTTP::Status IPC::Run)) {
@@ -240,14 +241,7 @@ my $check_self = sub {
};
SKIP: {
- my $have_curl = 0;
- foreach my $p (split(':', $ENV{PATH})) {
- -x "$p/curl" or next;
- $have_curl = 1;
- last;
- }
- my $ntest = 4;
- $have_curl or skip('curl(1) missing', $ntest);
+ which('curl') or skip('curl(1) missing', 4);
my $base = 'http://' . $sock->sockhost . ':' . $sock->sockport;
my $url = "$base/sha1";
my ($r, $w);
@@ -527,7 +521,6 @@ SKIP: {
is($x, $accf_arg, 'SO_ACCEPTFILTER unchanged if previously set');
};
SKIP: {
- use PublicInbox::Spawn qw(which);
skip 'only testing lsof(8) output on Linux', 1 if $^O ne 'linux';
skip 'no lsof in PATH', 1 unless which('lsof');
my @lsof = `lsof -p $pid`;
reply other threads:[~2019-09-15 0:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190915004725.19463-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).