From 8f5ef144acf5f15c132df655fd6f566f7d0d3233 Mon Sep 17 00:00:00 2001 From: Jakub Wartak Date: Thu, 16 Apr 2026 10:00:40 +0200 Subject: [PATCH v1] Fix test about the lack of the errdetail() signal info about PID/UIDs on OpenBSD. Commit 3e2a1496bae6 made the psql TAP test require the DETAIL line on platforms with SA_SIGINFO, rather than making it optional. This unexpectly blowed up on OpenBSD buildfarm members, because OpenBSD is not setting si_pid properly for SIGTERM signals even while having SA_SIGINFO defined. Make the DETAIL line optional as it was in 55890a919454. Author: Jakub Wartak Suggested-by: Tom Lane Reviewed-by: Andrew Dunstan Discussion: https://www.postgresql.org/message-id/2007157.1776269052%40sss.pgh.pa.us --- src/bin/psql/t/001_basic.pl | 5 +---- 1 file changed, 1 insertion(+), 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::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/, -- 2.43.0