From: Andrew Dunstan Date: Wed, 15 Apr 2026 18:41:33 +0000 (-0400) Subject: Make psql DETAIL line test unconditionally optional. X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=446c400fd89b46ac6e71fb01604ffd830f12c9e9;p=thirdparty%2Fpostgresql.git 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 Suggested-by: Tom Lane Discussion: https://www.postgresql.org/message-id/2007157.1776269052%40sss.pgh.pa.us --- 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::2: FATAL: terminating connection due to administrator command -${detail_re}psql::2: server closed the connection unexpectedly +(?:DETAIL: Signal sent by PID \d+, UID \d+\.\n)?psql::2: server closed the connection unexpectedly This probably means the server terminated abnormally before or while processing the request. psql::2: error: connection to server was lost/,