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:00:41 -0400 |
| commit | 104184d9562365432479691b917ebab45e55e214 (patch) | |
| tree | 134c479d69f3cd802fe3034c3bf264c6a7f244b7 /src | |
| parent | d97bdb082690980a78ca6e2bbe0c6d863caef32f (diff) | |
| download | postgresql-104184d9562365432479691b917ebab45e55e214.tar.gz postgresql-104184d9562365432479691b917ebab45e55e214.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index ec3a7ed96a7..aa7f3994caa 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" } |