[PATCH 0/2] tests: Perl 5.10.1 fixes

[PATCH 0/2] tests: Perl 5.10.1 fixes

[Eric Wong]

Oops, I only tested as far back as 5.16.3 last release :x
Oh well, seems pretty harmless.

Eric Wong (2):
  t/httpd-corner.t: fix uninitialized warning
  t/convert-compact: avoid warning on `scalar(split(...))'

 t/convert-compact.t | 3 +--
 t/httpd-corner.t    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

[PATCH 1/2] t/httpd-corner.t: fix uninitialized warning

[Eric Wong]

Current versions of Perl don't warn when vec() is given `undef'
as its first arg, but Perl 5.10.1 does, at least.

Fixes: c7b4cbdadf3116a0 ("t/httpd-corner: improve reliability and diagnostics")
---
 t/httpd-corner.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index 7a6bcc66..68148655 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -296,7 +296,7 @@ my $len = length $str;
 is($len, 26, 'got the alphabet');
 my $check_self = sub {
 	my ($conn) = @_;
-	vec(my $rbits, fileno($conn), 1) = 1;
+	vec(my $rbits = '', fileno($conn), 1) = 1;
 	select($rbits, undef, undef, 30) or Carp::confess('timed out');
 	$conn->read(my $buf, 4096);
 	my ($head, $body) = split(/\r\n\r\n/, $buf, 2);

[PATCH 2/2] t/convert-compact: avoid warning on `scalar(split(...))'

[Eric Wong]

Perl 5.10.1 would warn about implicit assignment to @_ by
split().  So favor the documented method of using `tr'
to count lines.

Fixes: b5ddcb3352ef31ae ("index: support --compact / -c on command-line")
---
 t/convert-compact.t | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/t/convert-compact.t b/t/convert-compact.t
index ae299021..1627e019 100644
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -124,7 +124,6 @@ $rdr->{2} = \(my $err2 = '');
 $cmd = [ qw(-index --reindex -cc), "$tmpdir/v2" ];
 ok(run_script($cmd, undef, $rdr), '--reindex -c -c');
 like($err2, qr/xapian-compact/, 'xapian-compact ran (-c -c)');
-ok(scalar(split(/\n/, $err2)) > scalar(split(/\n/, $err)),
-	'-compacted twice');
+ok(($err2 =~ tr/\n/\n/) > ($err =~ tr/\n/\n/), '-compacted twice');
 
 done_testing();