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 2dc737a2ec9a60181972c5c242b95b93f2285bac..5fdf8057f1e909ce275606676b3d69c1f1d95920 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"
 }