Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit455044d

Browse files
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 commit455044d

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

‎src/bin/initdb/t/001_initdb.pl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818
mkdir"$tempdir/data4"or BAIL_OUT($!);
1919
command_ok(['initdb',"$tempdir/data4" ],'existing empty data directory');
2020

21-
system_or_bail"rm -rf$tempdir/*";
21+
system_or_bail"rm -rf'$tempdir'/*";
2222

2323
command_ok(['initdb',"$tempdir/data",'-X',"$tempdir/pgxlog" ],
2424
'separate xlog directory');
2525

26-
system_or_bail"rm -rf$tempdir/*";
26+
system_or_bail"rm -rf'$tempdir'/*";
2727
command_fails(
2828
['initdb',"$tempdir/data",'-X','pgxlog' ],
2929
'relative xlog directory not allowed');
3030

31-
system_or_bail"rm -rf$tempdir/*";
31+
system_or_bail"rm -rf'$tempdir'/*";
3232
mkdir"$tempdir/pgxlog";
3333
command_ok(['initdb',"$tempdir/data",'-X',"$tempdir/pgxlog" ],
3434
'existing empty xlog directory');
3535

36-
system_or_bail"rm -rf$tempdir/*";
36+
system_or_bail"rm -rf'$tempdir'/*";
3737
mkdir"$tempdir/pgxlog";
3838
mkdir"$tempdir/pgxlog/lost+found";
3939
command_fails(['initdb',"$tempdir/data",'-X',"$tempdir/pgxlog" ],
4040
'existing nonempty xlog directory');
4141

42-
system_or_bail"rm -rf$tempdir/*";
42+
system_or_bail"rm -rf'$tempdir'/*";
4343
command_ok(['initdb',"$tempdir/data",'-T','german' ],
4444
'select default dictionary');

‎src/bin/pg_controldata/t/001_pg_controldata.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
command_fails(['pg_controldata'],'pg_controldata without arguments fails');
1212
command_fails(['pg_controldata','nonexistent' ],
1313
'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";
1515
command_like(['pg_controldata',"$tempdir/data" ],
1616
qr/checkpoint/,'pg_controldata produces output');

‎src/bin/pg_ctl/t/002_status.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
my$tempdir = TestLib::tempdir;
77
my$tempdir_short = TestLib::tempdir_short;
88

9-
system_or_bail"initdb -D$tempdir/data -A trust >/dev/null";
9+
system_or_bail"initdb -D'$tempdir'/data -A trust >/dev/null";
1010
open CONF,">>$tempdir/data/postgresql.conf";
1111
print CONF"listen_addresses = ''\n";
1212
print CONF"unix_socket_directories = '$tempdir_short'\n";

‎src/test/perl/TestLib.pm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ sub start_test_server
8888

8989
my$tempdir_short = tempdir_short;
9090

91-
system"initdb -D$tempdir/pgdata -A trust -N >/dev/null";
91+
system"initdb -D'$tempdir'/pgdata -A trust -N >/dev/null";
9292
$ret =system'pg_ctl','-D',"$tempdir/pgdata",'-s','-w','-l',
9393
"$tempdir/logfile",'-o',
9494
"--fsync=off -k$tempdir_short --listen-addresses='' --log-statement=all",
@@ -223,7 +223,7 @@ sub issues_sql_like
223223
truncate$test_server_logfile, 0;
224224
my$result = run$cmd,'>', \$stdout,'2>', \$stderr;
225225
ok($result,"@$cmd exit code 0");
226-
my$log =`cat$test_server_logfile`;
226+
my$log =`cat'$test_server_logfile'`;
227227
like($log,$expected_sql,"$test_name: SQL found in server log");
228228
};
229229
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp