From e61fb6d542979bba84b9e8afa73015a142c42541 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan <andrew@dunslane.net> Date: Thu, 17 Sep 2015 11:57:00 -0400 Subject: [PATCH] Honour TEMP_CONFIG when testing pg_upgrade This setting contains extra configuration for the temp instance, as used in pg_regress' --temp-config flag. Backpatch to 9.2 where test.sh was introduced. --- contrib/pg_upgrade/test.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh index f52e3f5ae6d..cb3edf8ea69 100644 --- a/contrib/pg_upgrade/test.sh +++ b/contrib/pg_upgrade/test.sh @@ -19,6 +19,10 @@ export PGPORT # authentication configuration. standard_initdb() { "$1" + if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ] + then + cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf" + fi ../../src/test/regress/pg_regress --config-auth "$PGDATA" } -- GitLab