aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/pg_rewind/RewindTest.pm15
1 files changed, 12 insertions, 3 deletions
diff --git a/src/bin/pg_rewind/RewindTest.pm b/src/bin/pg_rewind/RewindTest.pm
index 426bd6e5cf3..734adb72ec5 100644
--- a/src/bin/pg_rewind/RewindTest.pm
+++ b/src/bin/pg_rewind/RewindTest.pm
@@ -151,9 +151,18 @@ sub poll_query_until
$attempts++;
}
- # The query result didn't change in 90 seconds. Give up. Print the stderr
- # from the last attempt, hopefully that's useful for debugging.
- diag $stderr;
+ # The query result didn't change in 90 seconds. Give up. Print the
+ # output from the last attempt, hopefully that's useful for debugging.
+ chomp($stderr);
+ $stderr =~ s/\r//g if $Config{osname} eq 'msys';
+ diag qq(poll_query_until timed out executing this query:
+$query
+expecting this output:
+t
+last actual query output:
+$stdout
+with stderr:
+$stderr);
return 0;
}