Allow regression tests to use multiple socket directories.

Author: Bo Peng
Tested by Taiki Koshino

Backpatch-through: V4.5

diff --git a/src/test/pgpool_setup.in b/src/test/pgpool_setup.in
index 3823d85f20a5d2a5cb7a146dde445c6241a860ec..00510037f768ce462f480af0c1af2273526ae4aa 100644 (file)
--- a/src/test/pgpool_setup.in
+++ b/src/test/pgpool_setup.in
@@ -77,7 +77,7 @@ PGBIN=${PGBIN:-"@@PGSQL_BIN_DIR@@"}
 # LD_LIBRARY_PATH 
 LPATH=${PGLIB:-"@@PGSQL_LIB_DIR@@"}
 # unix socket directory
-PGSOCKET_DIR=${PGSOCKET_DIR:-"/tmp"}
+PGSOCKET_DIR=${PGSOCKET_DIR:-"/tmp,/var/run/postgresql"}
 # initdb args
 INITDBARG="--no-locale -E UTF_8"
 # Use replication slot

diff --git a/src/test/regression/regress.sh b/src/test/regression/regress.sh
index fd44415c0a630b205ae7a996b8aeef7728e5b076..c192a385e00814834d056acb0c7899bf7e90ba75 100755 (executable)
--- a/src/test/regression/regress.sh
+++ b/src/test/regression/regress.sh
@@ -22,7 +22,7 @@ export log=$dir/log
 fail=0
 ok=0
 timeout=0
-PGSOCKET_DIR=/tmp
+PGSOCKET_DIR=/tmp,/var/run/postgresql
 
 CRED=$(tput setaf 1)
 CGREEN=$(tput setaf 2)