From cf3ec1ddd2bf63b876b3c50b8ca3a806c4815588 Mon Sep 17 00:00:00 2001
From: Nazir Bilal Yavuz <byavuz81@gmail.com>
Date: Thu, 19 Nov 2026 10:05:10 +0300
Subject: [PATCH v3] Add PG_TEST_SERVER_POSTGRES_OPTS to inject server GUCs in
 tests

Allow pg_regress and TAP tests to append name=value settings to
postgresql.conf through the environment.

The GitHub Actions CI commit has not been backpatched to this branch
yet.  Including this commit reduces the backporting burden when we do.

Author: Nazir Bilal Yavuz <byavuz81@gmail.com>
Reviewed-by: Andrey Borodin <x4mmm@yandex-team.ru>
Reviewed-by: Jakub Wartak <jakub.wartak@enterprisedb.com>
Reviewed-by: Jelte Fennema-Nio <postgres@jeltef.nl>
Discussion: https://www.postgresql.org/message-id/CAN55FZ3jqqX9Th23XmDv6U-xwJjzsuc1JffYmswFT=oqy8JfrQ@mail.gmail.com
Backpatch: 15-, where CI support was added
---
 doc/src/sgml/regress.sgml                | 10 ++++++++++
 src/test/perl/PostgreSQL/Test/Cluster.pm | 16 ++++++++++++++++
 src/test/regress/pg_regress.c            | 22 ++++++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index aa380c20de6..dc8f73f304a 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -367,4 +367,14 @@ make check LANG=C ENCODING=EUC_JP
    <title>Custom Server Settings</title>
 
+   <para>
+    Run-time server settings can be added to the
+    <filename>postgresql.conf</filename> using the environment variable
+    <envar>PG_TEST_SERVER_POSTGRES_OPTS</envar>.  The settings are given as
+    whitespace-separated <literal>name=value</literal> pairs.  For example:
+<screen>
+make check PG_TEST_SERVER_POSTGRES_OPTS='work_mem=50MB debug_discard_caches=1'
+</screen>
+   </para>
+
    <para>
     Custom server settings to use when running a regression test suite can be
diff --git a/src/test/perl/PostgreSQL/Test/Cluster.pm b/src/test/perl/PostgreSQL/Test/Cluster.pm
index bcde0cacf08..b2f9fe6eec6 100644
--- a/src/test/perl/PostgreSQL/Test/Cluster.pm
+++ b/src/test/perl/PostgreSQL/Test/Cluster.pm
@@ -654,4 +654,20 @@ sub init
 	}
 
+	# PG_TEST_SERVER_POSTGRES_OPTS allows adding server settings via an
+	# environment variable.  The options are given as whitespace-separated
+	# "name=value" pairs.
+	#
+	# There's very similar code in pg_regress.c.
+	my $server_opts_env = $ENV{PG_TEST_SERVER_POSTGRES_OPTS};
+	if (defined $server_opts_env)
+	{
+		print $conf "# options from PG_TEST_SERVER_POSTGRES_OPTS\n";
+		foreach my $opt (split(/\s+/, $server_opts_env))
+		{
+			print $conf "$opt\n" if $opt ne '';
+		}
+		print $conf "# end of options from PG_TEST_SERVER_POSTGRES_OPTS\n";
+	}
+
 	print $conf "port = $port\n";
 	if ($use_tcp)
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 81d763470b5..c7542591323 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -2250,4 +2250,5 @@ regression_main(int argc, char *argv[],
 		const char *env_wait;
 		int			wait_seconds;
+		const char *server_opts_env;
 
 		/*
@@ -2332,4 +2333,25 @@ regression_main(int argc, char *argv[],
 		}
 
+		/*
+		 * PG_TEST_SERVER_POSTGRES_OPTS allows adding server settings via an
+		 * environment variable.  The options are given as whitespace-separated
+		 * "name=value" pairs.
+		 *
+		 * There's very similar code in Cluster.pm.
+		 */
+		server_opts_env = getenv("PG_TEST_SERVER_POSTGRES_OPTS");
+		if (server_opts_env != NULL)
+		{
+			char	   *opts = pg_strdup(server_opts_env);
+			char	   *tok;
+
+			fputs("# options from PG_TEST_SERVER_POSTGRES_OPTS\n", pg_conf);
+			for (tok = strtok(opts, " \t\n"); tok != NULL;
+				 tok = strtok(NULL, " \t\n"))
+				fprintf(pg_conf, "%s\n", tok);
+			free(opts);
+			fputs("# end of options from PG_TEST_SERVER_POSTGRES_OPTS\n", pg_conf);
+		}
+
 		fclose(pg_conf);
 
-- 
2.47.3

