From 90d7f6604b6ed2dcedee2884c3b01541600515cb Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 2 Jan 2020 19:44:43 -0500
Subject: [PATCH] Minor portability fixes for new TAP script.

Satisfy perlcritic, mostly.  Per buildfarm.
---
 src/bin/psql/t/010_tab_completion.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl
index 1c7610ffac4..a02cbd8e476 100644
--- a/src/bin/psql/t/010_tab_completion.pl
+++ b/src/bin/psql/t/010_tab_completion.pl
@@ -6,7 +6,7 @@ use TestLib;
 use Test::More;
 use IPC::Run qw(pump finish timer);
 
-if ($ENV{with_readline} ne 'yes')
+if (!defined($ENV{with_readline}) || $ENV{with_readline} ne 'yes')
 {
 	plan skip_all => 'readline is not supported by this build';
 }
@@ -64,6 +64,7 @@ sub check_completion
 	ok($okay, $annotation);
 	# for debugging, log actual output if it didn't match
 	note 'Actual output was "' . $out . "\"\n" if !$okay;
+	return;
 }
 
 # Clear query buffer to start over
@@ -71,6 +72,7 @@ sub check_completion
 sub clear_query
 {
 	check_completion("\\r\n", "postgres=# ", "\\r works");
+	return;
 }
 
 # check basic command completion: SEL<tab> produces SELECT<space>