summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dunstan2015-09-17 15:57:00 +0000
committerAndrew Dunstan2015-09-17 15:57:00 +0000
commit5f7c804ba155cc696297f06a819721f36a731181 (patch)
tree343497a913e157057f197f21adb987aa493fdb82
parent8dd401aa07b91d46f81e51321523864d32843523 (diff)
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.
-rw-r--r--src/bin/pg_upgrade/test.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index ec3a7ed96a..aa7f3994ca 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/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
../../test/regress/pg_regress --config-auth "$PGDATA"
}