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 13261f66d9e023ffa349e6bc1d75b1ab860044db..b6aaff2d97820f7b53680549056c17298a20de6a 100644 (file)
--- a/contrib/pg_upgrade/test.sh
+++ b/contrib/pg_upgrade/test.sh
@@ -21,6 +21,10 @@ unset MAKELEVEL
 # authentication configuration.
 standard_initdb() {
        "$1" -N
+       if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
+       then
+               cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
+       fi
        ../../src/test/regress/pg_regress --config-auth "$PGDATA"
 }