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:04:16 -0400 |
| commit | 5ed2d2cba8823670392400bc6663ff2dbd260292 (patch) | |
| tree | e87668c53be1954c84c3b0caa1521ec60ef4fe3c | |
| parent | e2e46a9d1c22aa8a6ef7fd498a063fc7d4d300ef (diff) | |
| download | postgresql-5ed2d2cba8823670392400bc6663ff2dbd260292.tar.gz postgresql-5ed2d2cba8823670392400bc6663ff2dbd260292.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.
| -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 13261f66d9e..b6aaff2d978 100644 --- 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" } |