diff options
author | Noah Misch <noah@leadboat.com> | 2022-11-17 07:35:06 -0800 |
---|---|---|
committer | Noah Misch <noah@leadboat.com> | 2022-11-17 07:43:14 -0800 |
commit | 7298b904b88598cee50e1b7649ba530811040706 (patch) | |
tree | 3c7ffa547a49c6116572ada1913ec9ca5875b836 | |
parent | b2b9881109def2be4b162149bf67dad8def53869 (diff) | |
download | postgresql-7298b904b88598cee50e1b7649ba530811040706.tar.gz |
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.pm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index 7c98d286a1..7eca7e9d39 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -298,15 +298,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_result 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); |