postgres.git / summary / log / commit / refs

commit    5ed2d2cba8823670392400bc6663ff2dbd260292
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Thu Sep 17 15:57:00 2015 +0000
First released in: 9.6.0, 9.2.14, 9.3.10, 9.4.5, 9.5.0

    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.


 contrib/pg_upgrade/test.sh | 4 ++++
 1 file changed, 4 insertions(+)

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"
 }
 


[parent: e2e46a9d1c22]