mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pg_regress now needs to know that Windows hasn't got unix sockets,

Browse Source 
per Andrew Dunstan.  Also, don't override the user's value of PGHOST
in the 'make installcheck' case.  I think the latter was an ill-considered
workaround for the Windows code back when libpq didn't properly default
to localhost on Unix-socket-less platforms.
This commit is contained in:
Tom Lane 2005-01-15 04:15:51 +00:00
parent 893c66de69
commit 7a6a7d57b4
1 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/regress/pg_regress.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.52 2005/01/12 16:19:51 tgl Exp $ # $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.53 2005/01/15 04:15:51 tgl Exp $
me=`basename $0` me=`basename $0`
: ${TMPDIR=/tmp} : ${TMPDIR=/tmp}
@ -192,11 +192,10 @@ esac
# ---------- # ----------
# When on QNX or BeOS, don't use Unix sockets. # On some platforms we can't use Unix sockets.
# ---------- # ----------
case $host_platform in case $host_platform in
*-*-qnx* | *beos*) *-*-cygwin* | *-*-mingw32* | *-*-qnx* | *beos*)
unix_sockets=no;; unix_sockets=no;;
*) *)
unix_sockets=yes;; unix_sockets=yes;;
@ -470,13 +469,6 @@ else # not temp-install
;; ;;
esac esac
# If Unix sockets are not available, use the local host by default.
if [ "$unix_sockets" = no ]; then
PGHOST=$hostname
export PGHOST
unset PGHOSTADDR
fi
if [ -n "$PGPORT" ]; then if [ -n "$PGPORT" ]; then
port_info="port $PGPORT" port_info="port $PGPORT"
else else
@ -486,15 +478,13 @@ else # not temp-install
if [ -n "$PGHOST" ]; then if [ -n "$PGHOST" ]; then
echo "(using postmaster on $PGHOST, $port_info)" echo "(using postmaster on $PGHOST, $port_info)"
else else
case $host_platform in if [ "$unix_sockets" = no ]; then
*-*-mingw32*) echo "(using postmaster on localhost, $port_info)"
echo "(using postmaster on localhost socket, $port_info)" else
;;
*)
echo "(using postmaster on Unix socket, $port_info)" echo "(using postmaster on Unix socket, $port_info)"
;;
esac
fi fi
fi
message "dropping database \"$dbname\"" message "dropping database \"$dbname\""
"$bindir/dropdb" $psql_options "$dbname" "$bindir/dropdb" $psql_options "$dbname"
# errors can be ignored # errors can be ignored