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

Commit15c3a1b

Browse files
committed
More fixes to allow pg_rewind tests to run on Msys.
1 parent6fcd885 commit15c3a1b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

‎src/bin/pg_rewind/RewindTest.pm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use warnings;
4040
use TestLib;
4141
use Test::More;
4242

43+
use Config;
4344
use File::Copy;
4445
use File::Pathqw(rmtree);
4546
use IPC::Runqw(run start);
@@ -119,6 +120,7 @@ sub check_query
119120
}
120121
else
121122
{
123+
$stdout =~s/\r//gif$Config{osname}eq'msys';
122124
is($stdout,$expected_stdout,"$test_name: query result matches");
123125
}
124126
}
@@ -138,6 +140,7 @@ sub poll_query_until
138140
my$result = run$cmd,'>', \$stdout,'2>', \$stderr;
139141

140142
chomp($stdout);
143+
$stdout =~s/\r//gif$Config{osname}eq'msys';
141144
if ($stdouteq"t")
142145
{
143146
return 1;

‎src/bin/pg_rewind/t/004_pg_xlog_symlink.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use strict;
55
use warnings;
66
use File::Copy;
7-
use File::Pathqw(remove_tree);
7+
use File::Pathqw(rmtree);
88
use TestLib;
99
use Test::More;
1010
if ($windows_os)
@@ -25,7 +25,7 @@ sub run_test
2525

2626
my$master_xlogdir ="$tmp_check/xlog_master";
2727

28-
remove_tree($master_xlogdir);
28+
rmtree($master_xlogdir);
2929
RewindTest::setup_cluster();
3030

3131
# turn pg_xlog into a symlink

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp