aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2023-11-02 12:38:23 +0900
committerMichael Paquier <michael@paquier.xyz>2023-11-02 12:38:23 +0900
commite22819a747365facbe8f504dc3a4996a02114e05 (patch)
treef544206fb304cf1cad616dfa01f6f34484ab48f6 /src
parent354b3ebf17c45ff5037c763cd59b03089c520427 (diff)
downloadpostgresql-e22819a747365facbe8f504dc3a4996a02114e05.tar.gz
postgresql-e22819a747365facbe8f504dc3a4996a02114e05.zip
Fix 003_check_guc.pl when loading modules with custom GUCs
The test missed that custom GUCs need to be ignored from the list of parameters that can exist in postgresql.conf.sample. This caused the test to fail on a server where such a module is loaded, when using EXTRA_INSTALL and TEMP_CONFIG, for instance. Author: Anton A. Melnikov Discussion: https://postgr.es/m/fc5509ce-5144-4dac-8d13-21793da44fc5@postgrespro.ru Backpatch-through: 15
Diffstat (limited to 'src')
-rw-r--r--src/test/modules/test_misc/t/003_check_guc.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/modules/test_misc/t/003_check_guc.pl b/src/test/modules/test_misc/t/003_check_guc.pl
index 4fd6d03b9e6..a5d680e82e7 100644
--- a/src/test/modules/test_misc/t/003_check_guc.pl
+++ b/src/test/modules/test_misc/t/003_check_guc.pl
@@ -14,12 +14,13 @@ $node->start;
# Grab the names of all the parameters that can be listed in the
# configuration sample file. config_file is an exception, it is not
# in postgresql.conf.sample but is part of the lists from guc_tables.c.
+# Custom GUCs loaded by extensions are excluded.
my $all_params = $node->safe_psql(
'postgres',
"SELECT name
FROM pg_settings
WHERE NOT 'NOT_IN_SAMPLE' = ANY (pg_settings_get_flags(name)) AND
- name <> 'config_file'
+ name <> 'config_file' AND category <> 'Customized Options'
ORDER BY 1");
# Note the lower-case conversion, for consistency.
my @all_params_array = split("\n", lc($all_params));