diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2015-09-17 11:57:00 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2015-09-17 12:12:06 -0400 |
| commit | e61fb6d542979bba84b9e8afa73015a142c42541 (patch) | |
| tree | feba5470be098aa8ae7e16cb6db5fadf2775c4b9 | |
| parent | 11103c6d95e43bf720b2293cb4c4b2f6efc4947a (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-- | contrib/pg_upgrade/test.sh | 4 |
1 files changed, 4 insertions, 0 deletions
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" } |