upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-05-19 08:41:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make psql DETAIL line test unconditionally optional.

Browse source 
Commit 3e2a1496ba 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 55890a9194, 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
This commit is contained in:
Andrew Dunstan 2026-04-15 14:41:33 -04:00
parent 05c401d578
commit 446c400fd8
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/bin/psql/t/001_basic.pl
View file

@ -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/,