Commit455044d

committed

Fix TAP installcheck tests when current directory name contains spaces

This fixes the installcheck part. The check part has additionalproblems that will be addressed in a separate commit.

1 parent4fd9e6f commit455044dCopy full SHA for 455044d

File tree

-9

lines changed

-9

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,27 +18,27 @@`
`18`	`18`	`mkdir"$tempdir/data4"or BAIL_OUT($!);`
`19`	`19`	`command_ok(['initdb',"$tempdir/data4" ],'existing empty data directory');`
`20`	`20`
`21`		`-system_or_bail"rm -rf$tempdir/*";`
	`21`	`+system_or_bail"rm -rf'$tempdir'/*";`
`22`	`22`
`23`	`23`	`command_ok(['initdb',"$tempdir/data",'-X',"$tempdir/pgxlog" ],`
`24`	`24`	`'separate xlog directory');`
`25`	`25`
`26`		`-system_or_bail"rm -rf$tempdir/*";`
	`26`	`+system_or_bail"rm -rf'$tempdir'/*";`
`27`	`27`	`command_fails(`
`28`	`28`	`['initdb',"$tempdir/data",'-X','pgxlog' ],`
`29`	`29`	`'relative xlog directory not allowed');`
`30`	`30`
`31`		`-system_or_bail"rm -rf$tempdir/*";`
	`31`	`+system_or_bail"rm -rf'$tempdir'/*";`
`32`	`32`	`mkdir"$tempdir/pgxlog";`
`33`	`33`	`command_ok(['initdb',"$tempdir/data",'-X',"$tempdir/pgxlog" ],`
`34`	`34`	`'existing empty xlog directory');`
`35`	`35`
`36`		`-system_or_bail"rm -rf$tempdir/*";`
	`36`	`+system_or_bail"rm -rf'$tempdir'/*";`
`37`	`37`	`mkdir"$tempdir/pgxlog";`
`38`	`38`	`mkdir"$tempdir/pgxlog/lost+found";`
`39`	`39`	`command_fails(['initdb',"$tempdir/data",'-X',"$tempdir/pgxlog" ],`
`40`	`40`	`'existing nonempty xlog directory');`
`41`	`41`
`42`		`-system_or_bail"rm -rf$tempdir/*";`
	`42`	`+system_or_bail"rm -rf'$tempdir'/*";`
`43`	`43`	`command_ok(['initdb',"$tempdir/data",'-T','german' ],`
`44`	`44`	`'select default dictionary');`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`command_fails(['pg_controldata'],'pg_controldata without arguments fails');`
`12`	`12`	`command_fails(['pg_controldata','nonexistent' ],`
`13`	`13`	`'pg_controldata with nonexistent directory fails');`
`14`		`-system_or_bail"initdb -D$tempdir/data -A trust >/dev/null";`
	`14`	`+system_or_bail"initdb -D'$tempdir'/data -A trust >/dev/null";`
`15`	`15`	`command_like(['pg_controldata',"$tempdir/data" ],`
`16`	`16`	`qr/checkpoint/,'pg_controldata produces output');`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`my$tempdir = TestLib::tempdir;`
`7`	`7`	`my$tempdir_short = TestLib::tempdir_short;`
`8`	`8`
`9`		`-system_or_bail"initdb -D$tempdir/data -A trust >/dev/null";`
	`9`	`+system_or_bail"initdb -D'$tempdir'/data -A trust >/dev/null";`
`10`	`10`	`open CONF,">>$tempdir/data/postgresql.conf";`
`11`	`11`	`print CONF"listen_addresses = ''\n";`
`12`	`12`	`print CONF"unix_socket_directories = '$tempdir_short'\n";`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ sub start_test_server`
`88`	`88`
`89`	`89`	`my$tempdir_short = tempdir_short;`
`90`	`90`
`91`		`-system"initdb -D$tempdir/pgdata -A trust -N >/dev/null";`
	`91`	`+system"initdb -D'$tempdir'/pgdata -A trust -N >/dev/null";`
`92`	`92`	`$ret =system'pg_ctl','-D',"$tempdir/pgdata",'-s','-w','-l',`
`93`	`93`	`"$tempdir/logfile",'-o',`
`94`	`94`	`"--fsync=off -k$tempdir_short --listen-addresses='' --log-statement=all",`
`@@ -223,7 +223,7 @@ sub issues_sql_like`
`223`	`223`	`truncate$test_server_logfile, 0;`
`224`	`224`	`my$result = run$cmd,'>', \$stdout,'2>', \$stderr;`
`225`	`225`	`ok($result,"@$cmd exit code 0");`
`226`		-my$log =`cat$test_server_logfile`;
	`226`	+my$log =`cat'$test_server_logfile'`;
`227`	`227`	`like($log,$expected_sql,"$test_name: SQL found in server log");`
`228`	`228`	`};`
`229`	`229`	`}`

Comments

(0)