From: Andrew Dunstan <andrew@dunslane.net>
Date: Thu, 17 Sep 2015 15:57:00 +0000 (-0400)
Subject: Honour TEMP_CONFIG when testing pg_upgrade
X-Git-Tag: REL9_2_14~35
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=e61fb6d542979bba84b9e8afa73015a142c42541;p=postgresql.git

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.
---

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"
 }