diff options
| author | Andrew Dunstan | 2026-04-15 18:41:33 +0000 |
|---|---|---|
| committer | Andrew Dunstan | 2026-04-16 20:56:18 +0000 |
| commit | 446c400fd89b46ac6e71fb01604ffd830f12c9e9 (patch) | |
| tree | a9a94a36123dc564019cdc46ce051a1c6d8cdd25 /src/bin | |
| parent | 05c401d5786a05ea630e884ffa492aa01683d15b (diff) | |
Make psql DETAIL line test unconditionally optional.
Commit 3e2a1496bae6 made the psql TAP test require the DETAIL line on
platforms with SA_SIGINFO, rather than making it optional. This
unexpectedly blew up on OpenBSD buildfarm members, because OpenBSD does
not set si_pid for SIGTERM signals even though it has SA_SIGINFO
defined.
So revert to the test as it was in commit 55890a919454, where the detail
line being missing never causes an error.
Author: Jakub Wartak <jakub.wartak@enterprisedb.com>
Suggested-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/2007157.1776269052%40sss.pgh.pa.us
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/psql/t/001_basic.pl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/bin/psql/t/001_basic.pl b/src/bin/psql/t/001_basic.pl index 9d966c7bece..7c21204c1f2 100644 --- a/src/bin/psql/t/001_basic.pl +++ b/src/bin/psql/t/001_basic.pl @@ -142,11 +142,8 @@ my ($ret, $out, $err) = $node->psql('postgres', is($ret, 2, 'server crash: psql exit code'); like($out, qr/before/, 'server crash: output before crash'); unlike($out, qr/AFTER/, 'server crash: no output after crash'); -my $detail_re = check_pg_config("#define HAVE_SA_SIGINFO 1") - ? qr/DETAIL: Signal sent by PID \d+, UID \d+\.\n/ - : qr//; like( $err, qr/psql:<stdin>:2: FATAL: terminating connection due to administrator command -${detail_re}psql:<stdin>:2: server closed the connection unexpectedly +(?:DETAIL: Signal sent by PID \d+, UID \d+\.\n)?psql:<stdin>:2: server closed the connection unexpectedly This probably means the server terminated abnormally before or while processing the request. psql:<stdin>:2: error: connection to server was lost/, |