SSL tests: Silence pg_ctl output

petere · petere · commit ce37eff06df6 · 2014-12-11T21:32:30.000-05:00
Otherwise the pg_ctl start and stop messages get mixed up with the TAP
output, which isn't technically valid.
diff --git a/src/test/ssl/ServerSetup.pm b/src/test/ssl/ServerSetup.pm
@@ -90,7 +90,7 @@ sub switch_server_cert
   # restart_test_server() because that overrides listen_addresses to only all
   # Unix domain socket connections.
 
-  system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/pgdata", '-w';
-  system_or_bail 'pg_ctl', 'start', '-D', "$tempdir/pgdata", '-w', '-l',
+  system_or_bail 'pg_ctl', 'stop', '-s', '-D', "$tempdir/pgdata", '-w';
+  system_or_bail 'pg_ctl', 'start', '-s', '-D', "$tempdir/pgdata", '-w', '-l',
         "$tempdir/logfile";
 }

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ sub switch_server_cert`
`90`	`90`	`# restart_test_server() because that overrides listen_addresses to only all`
`91`	`91`	`# Unix domain socket connections.`
`92`	`92`
`93`		`- system_or_bail 'pg_ctl', 'stop', '-D', "$tempdir/pgdata", '-w';`
`94`		`- system_or_bail 'pg_ctl', 'start', '-D', "$tempdir/pgdata", '-w', '-l',`
	`93`	`+ system_or_bail 'pg_ctl', 'stop', '-s', '-D', "$tempdir/pgdata", '-w';`
	`94`	`+ system_or_bail 'pg_ctl', 'start', '-s', '-D', "$tempdir/pgdata", '-w', '-l',`
`95`	`95`	`"$tempdir/logfile";`
`96`	`96`	`}`