user/dev discussion of public-inbox itself
 help / color / Atom feed
* [PATCH] t/httpd-corner: use which() sub for detecting curl(1)
@ 2019-09-15  0:47 Eric Wong
  0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2019-09-15  0:47 UTC (permalink / raw)
  To: meta

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`;

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, back to index

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-15  0:47 [PATCH] t/httpd-corner: use which() sub for detecting curl(1) Eric Wong

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror http://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox