summaryrefslogtreecommitdiff
path: root/src/bin/initdb
diff options
context:
space:
mode:
authorPeter Eisentraut2014-07-24 01:41:59 +0000
committerPeter Eisentraut2014-07-24 02:06:56 +0000
commit455044d55a89d16d888f289aeaf1229a04a04b9f (patch)
tree80a2af729979f0f3075aaf12d42b92d43b67a754 /src/bin/initdb
parent4fd9e6ffdd9aae51a935c255cbf7691c369ded1b (diff)
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.
Diffstat (limited to 'src/bin/initdb')
-rw-r--r--src/bin/initdb/t/001_initdb.pl10
1 files changed, 5 insertions, 5 deletions
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');