Minor portability fixes for new TAP script.

tglsfdc · tglsfdc · commit 90d7f6604b6e · 2020-01-02T19:45:00.000-05:00
Satisfy perlcritic, mostly.  Per buildfarm.
diff --git a/src/bin/psql/t/010_tab_completion.pl b/src/bin/psql/t/010_tab_completion.pl
@@ -6,7 +6,7 @@
 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,13 +64,15 @@ 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
 # (won't work if we are inside a string literal!)
 sub clear_query
 {
 	check_completion("\\r\n", "postgres=# ", "\\r works");
+	return;
 }
 
 # check basic command completion: SEL<tab> produces SELECT<space>

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Test::More;`
`7`	`7`	`use IPC::Run qw(pump finish timer);`
`8`	`8`
`9`		`-if ($ENV{with_readline} ne 'yes')`
	`9`	`+if (!defined($ENV{with_readline}) \|\| $ENV{with_readline} ne 'yes')`
`10`	`10`	`{`
`11`	`11`	`plan skip_all => 'readline is not supported by this build';`
`12`	`12`	`}`
`@@ -64,13 +64,15 @@ sub check_completion`
`64`	`64`	`ok($okay, $annotation);`
`65`	`65`	`# for debugging, log actual output if it didn't match`
`66`	`66`	`note 'Actual output was "' . $out . "\"\n" if !$okay;`
	`67`	`+ return;`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`# Clear query buffer to start over`
`70`	`71`	`# (won't work if we are inside a string literal!)`
`71`	`72`	`sub clear_query`
`72`	`73`	`{`
`73`	`74`	`check_completion("\\r\n", "postgres=# ", "\\r works");`
	`75`	`+ return;`
`74`	`76`	`}`
`75`	`77`
`76`	`78`	`# check basic command completion: SEL<tab> produces SELECT<space>`