[PATCH 0/4] some minor test updates

[PATCH 0/4] some minor test updates

[Eric Wong]

A few minor, low impact improvements to avoid loading
and running redundant code while I'm ironing out some
major test improvements.

Eric Wong (4):
  t/common: inline stream_to_string into t/feed.t
  t/common: move unix_server to t/httpd-corner.t
  t/psgi_mount: require SearchIdx before using
  doc: check-man: save the result of successful runs

 .gitignore               |  1 +
 Documentation/include.mk | 13 +++++++------
 t/common.perl            | 21 ---------------------
 t/feed.t                 |  9 ++++++++-
 t/httpd-corner.t         | 10 ++++++++++
 t/psgi_mount.t           |  3 ++-
 6 files changed, 28 insertions(+), 29 deletions(-)

[PATCH 1/4] t/common: inline stream_to_string into t/feed.t

[Eric Wong]

We only use it in one place and have favored test_psgi
in newer tests, so move it out-of-the-way to reduce startup
overhead of other *.t files.
---
 t/common.perl | 11 -----------
 t/feed.t      |  9 ++++++++-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/t/common.perl b/t/common.perl
index ccc7be46..053a935a 100644
--- a/t/common.perl
+++ b/t/common.perl
@@ -7,17 +7,6 @@ use strict;
 use warnings;
 use IO::Socket::INET;
 
-sub stream_to_string {
-	my ($res) = @_;
-	my $body = $res->[2];
-	my $str = '';
-	while (defined(my $chunk = $body->getline)) {
-		$str .= $chunk;
-	}
-	$body->close;
-	$str;
-}
-
 sub tcp_server () {
 	IO::Socket::INET->new(
 		LocalAddr => '127.0.0.1',
diff --git a/t/feed.t b/t/feed.t
index eb1f35fb..93da3717 100644
--- a/t/feed.t
+++ b/t/feed.t
@@ -14,7 +14,14 @@ my $have_xml_feed = eval { require XML::Feed; 1 };
 require './t/common.perl';
 
 sub string_feed {
-	stream_to_string(PublicInbox::Feed::generate($_[0]));
+	my $res = PublicInbox::Feed::generate($_[0]);
+	my $body = $res->[2];
+	my $str = '';
+	while (defined(my $chunk = $body->getline)) {
+		$str .= $chunk;
+	}
+	$body->close;
+	$str;
 }
 
 my $tmpdir = tempdir('pi-feed-XXXXXX', TMPDIR => 1, CLEANUP => 1);

[PATCH 2/4] t/common: move unix_server to t/httpd-corner.t

[Eric Wong]

unix_server() is not commonly used, only t/httpd-corner.t uses
it and most HTTP tests use TCP since most HTTP libraries only
support TCP.
---
 t/common.perl    | 10 ----------
 t/httpd-corner.t | 10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/t/common.perl b/t/common.perl
index 053a935a..d4a0fcd2 100644
--- a/t/common.perl
+++ b/t/common.perl
@@ -18,16 +18,6 @@ sub tcp_server () {
 	)
 }
 
-sub unix_server ($) {
-	my $s = IO::Socket::UNIX->new(
-		Listen => 1024,
-		Type => Socket::SOCK_STREAM(),
-		Local => $_[0],
-	);
-	$s->blocking(0);
-	$s;
-}
-
 sub tcp_connect {
 	my ($dest, %opt) = @_;
 	my $s = IO::Socket::INET->new(
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 75573c3e..b063d9fa 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -51,6 +51,16 @@ if ($^O eq 'linux') {
 	setsockopt($sock, SOL_SOCKET, $var, $accf_arg) or die "setsockopt: $!";
 }
 
+sub unix_server ($) {
+	my $s = IO::Socket::UNIX->new(
+		Listen => 1024,
+		Type => Socket::SOCK_STREAM(),
+		Local => $_[0],
+	);
+	$s->blocking(0);
+	$s;
+}
+
 my $upath = "$tmpdir/s";
 my $unix = unix_server($upath);
 ok($unix, 'UNIX socket created');

[PATCH 3/4] t/psgi_mount: require SearchIdx before using

[Eric Wong]

We may not implicitly load it via other means in the future.
---
 t/psgi_mount.t | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index aa7c863f..7de2bc0e 100644
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -90,9 +90,10 @@ test_psgi($app, sub {
 SKIP: {
 	my @mods = qw(DBI DBD::SQLite Search::Xapian IO::Uncompress::Gunzip);
 	foreach my $mod (@mods) {
-		eval "require $mod" or skip "$mod not available: $@", 2;
+		eval "require $mod" or skip "$mod not available: $@", 3;
 	}
 	my $ibx = $config->lookup_name('test');
+	require_ok 'PublicInbox::SearchIdx';
 	PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 	test_psgi($app, sub {
 		my ($cb) = @_;

[PATCH 4/4] doc: check-man: save the result of successful runs

[Eric Wong]

We can keep a stamp around if the corresponding manpage hasn't
changed to avoid re-running man(1) and awk(1).
---
 .gitignore               |  1 +
 Documentation/include.mk | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 66f165e2..167d08bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 *.8
 *.html
 *.gz
+.*.cols
 /NEWS.html
 /NEWS.atom
 /NEWS
diff --git a/Documentation/include.mk b/Documentation/include.mk
index ea0498c1..651fdf30 100644
--- a/Documentation/include.mk
+++ b/Documentation/include.mk
@@ -93,14 +93,15 @@ doc_install :: install-man
 
 check :: check-man
 check_man = @echo CHECK80 $<;COLUMNS=80 $(MAN) ./$^ | \
-	$(AWK) '{gsub(/\b./,"")}length>80{print;err=1}END{exit(err)}' >&2
+	$(AWK) '{gsub(/\b./,"")}length>80{print;err=1}END{exit(err)}' >&2 \
+	&& >$@
 
-%.1.cols : %.1; $(check_man)
-%.5.cols : %.5; $(check_man)
-%.7.cols : %.7; $(check_man)
-%.8.cols : %.8; $(check_man)
+.%.1.cols : %.1; $(check_man)
+.%.5.cols : %.5; $(check_man)
+.%.7.cols : %.7; $(check_man)
+.%.8.cols : %.8; $(check_man)
 
-check-man :: $(addsuffix .cols, $(manpages))
+check-man :: $(addprefix .,$(addsuffix .cols, $(manpages)))
 
 manuals :=
 manuals += $(m1)