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 f52e3f5ae6dd7c20b0a5c788a560b9ef284464e2..cb3edf8ea69947c1f89f2774c6e4acc69ffb3afa 100644 (file)
--- 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"
 }