Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
postgres-lambda-diff
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jakob Huber
postgres-lambda-diff
Commits
15c3a1b4
Commit
15c3a1b4
authored
9 years ago
by
Andrew Dunstan
Browse files
Options
Downloads
Patches
Plain Diff
More fixes to allow pg_rewind tests to run on Msys.
parent
6fcd8851
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/bin/pg_rewind/RewindTest.pm
+3
-0
3 additions, 0 deletions
src/bin/pg_rewind/RewindTest.pm
src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
+2
-2
2 additions, 2 deletions
src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
with
5 additions
and
2 deletions
src/bin/pg_rewind/RewindTest.pm
+
3
−
0
View file @
15c3a1b4
...
@@ -40,6 +40,7 @@ use warnings;
...
@@ -40,6 +40,7 @@ use warnings;
use
TestLib
;
use
TestLib
;
use
Test::
More
;
use
Test::
More
;
use
Config
;
use
File::
Copy
;
use
File::
Copy
;
use
File::
Path
qw(rmtree)
;
use
File::
Path
qw(rmtree)
;
use
IPC::
Run
qw(run start)
;
use
IPC::
Run
qw(run start)
;
...
@@ -119,6 +120,7 @@ sub check_query
...
@@ -119,6 +120,7 @@ sub check_query
}
}
else
else
{
{
$stdout
=~
s/\r//g
if
$Config
{
osname
}
eq
'
msys
';
is
(
$stdout
,
$expected_stdout
,
"
$test_name
: query result matches
");
is
(
$stdout
,
$expected_stdout
,
"
$test_name
: query result matches
");
}
}
}
}
...
@@ -138,6 +140,7 @@ sub poll_query_until
...
@@ -138,6 +140,7 @@ sub poll_query_until
my
$result
=
run
$cmd
,
'
>
',
\
$stdout
,
'
2>
',
\
$stderr
;
my
$result
=
run
$cmd
,
'
>
',
\
$stdout
,
'
2>
',
\
$stderr
;
chomp
(
$stdout
);
chomp
(
$stdout
);
$stdout
=~
s/\r//g
if
$Config
{
osname
}
eq
'
msys
';
if
(
$stdout
eq
"
t
")
if
(
$stdout
eq
"
t
")
{
{
return
1
;
return
1
;
...
...
This diff is collapsed.
Click to expand it.
src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
+
2
−
2
View file @
15c3a1b4
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
use
strict
;
use
strict
;
use
warnings
;
use
warnings
;
use
File::
Copy
;
use
File::
Copy
;
use
File::
Path
qw(r
emove_
tree)
;
use
File::
Path
qw(r
m
tree)
;
use
TestLib
;
use
TestLib
;
use
Test::
More
;
use
Test::
More
;
if
(
$windows_os
)
if
(
$windows_os
)
...
@@ -25,7 +25,7 @@ sub run_test
...
@@ -25,7 +25,7 @@ sub run_test
my
$master_xlogdir
=
"
$tmp_check
/xlog_master
";
my
$master_xlogdir
=
"
$tmp_check
/xlog_master
";
r
emove_
tree
(
$master_xlogdir
);
r
m
tree
(
$master_xlogdir
);
RewindTest::
setup_cluster
();
RewindTest::
setup_cluster
();
# turn pg_xlog into a symlink
# turn pg_xlog into a symlink
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment