From 455044d55a89d16d888f289aeaf1229a04a04b9f Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Wed, 23 Jul 2014 21:41:59 -0400 Subject: Fix TAP installcheck tests when current directory name contains spaces This fixes the installcheck part. The check part has additional problems that will be addressed in a separate commit. --- src/bin/initdb/t/001_initdb.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/bin/initdb') diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl index a7bea76f52..db92a88a4e 100644 --- a/src/bin/initdb/t/001_initdb.pl +++ b/src/bin/initdb/t/001_initdb.pl @@ -18,27 +18,27 @@ command_fails([ 'initdb', '-S', "$tempdir/data3" ], mkdir "$tempdir/data4" or BAIL_OUT($!); command_ok([ 'initdb', "$tempdir/data4" ], 'existing empty data directory'); -system_or_bail "rm -rf $tempdir/*"; +system_or_bail "rm -rf '$tempdir'/*"; command_ok([ 'initdb', "$tempdir/data", '-X', "$tempdir/pgxlog" ], 'separate xlog directory'); -system_or_bail "rm -rf $tempdir/*"; +system_or_bail "rm -rf '$tempdir'/*"; command_fails( [ 'initdb', "$tempdir/data", '-X', 'pgxlog' ], 'relative xlog directory not allowed'); -system_or_bail "rm -rf $tempdir/*"; +system_or_bail "rm -rf '$tempdir'/*"; mkdir "$tempdir/pgxlog"; command_ok([ 'initdb', "$tempdir/data", '-X', "$tempdir/pgxlog" ], 'existing empty xlog directory'); -system_or_bail "rm -rf $tempdir/*"; +system_or_bail "rm -rf '$tempdir'/*"; mkdir "$tempdir/pgxlog"; mkdir "$tempdir/pgxlog/lost+found"; command_fails([ 'initdb', "$tempdir/data", '-X', "$tempdir/pgxlog" ], 'existing nonempty xlog directory'); -system_or_bail "rm -rf $tempdir/*"; +system_or_bail "rm -rf '$tempdir'/*"; command_ok([ 'initdb', "$tempdir/data", '-T', 'german' ], 'select default dictionary'); -- cgit v1.2.3