aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch <noah@leadboat.com>2022-11-17 07:35:06 -0800
committerNoah Misch <noah@leadboat.com>2022-11-17 07:36:45 -0800
commitaaf28c90654425c2e94dc2c8b2d0d8d971483c7e (patch)
tree8ea9ad0541027dc3231dec25aa188fbf123ac5aa
parent9693f190076ec04fd06d63ab00ba4d0383515b7c (diff)
downloadpostgresql-aaf28c90654425c2e94dc2c8b2d0d8d971483c7e.tar.gz
postgresql-aaf28c90654425c2e94dc2c8b2d0d8d971483c7e.zip
Account for IPC::Run::result() Windows behavior change.
This restores compatibility with the not-yet-released successor of version 20220807.0. Back-patch to 9.4, which introduced this code. Reviewed by Andrew Dunstan. Discussion: https://postgr.es/m/20221117061805.GA4020280@rfd.leadboat.com
-rw-r--r--src/test/perl/TestLib.pm12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 610050e1c4b..2a354ea4ef9 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -758,15 +758,11 @@ sub command_exit_is
my $h = IPC::Run::start $cmd;
$h->finish();
- # On Windows, the exit status of the process is returned directly as the
- # process's exit code, while on Unix, it's returned in the high bits
- # of the exit code (see WEXITSTATUS macro in the standard <sys/wait.h>
- # header file). IPC::Run's result function always returns exit code >> 8,
- # assuming the Unix convention, which will always return 0 on Windows as
- # long as the process was not terminated by an exception. To work around
- # that, use $h->full_results on Windows instead.
+ # Normally, if the child called exit(N), IPC::Run::result() returns N. On
+ # Windows, with IPC::Run v20220807.0 and earlier, full_results() is the
+ # method that returns N (https://github.com/toddr/IPC-Run/issues/161).
my $result =
- ($Config{osname} eq "MSWin32")
+ ($Config{osname} eq "MSWin32" && $IPC::Run::VERSION <= 20220807.0)
? ($h->full_results)[0]
: $h->result(0);
is($result, $expected, $test_name);