Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit7a6a7d5

Browse files
committed
pg_regress now needs to know that Windows hasn't got unix sockets,
per Andrew Dunstan. Also, don't override the user's value of PGHOSTin the 'make installcheck' case. I think the latter was an ill-consideredworkaround for the Windows code back when libpq didn't properly defaultto localhost on Unix-socket-less platforms.
1 parent893c66d commit7a6a7d5

File tree

1 file changed

+13
-23
lines changed

1 file changed

+13
-23
lines changed

‎src/test/regress/pg_regress.sh

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.52 2005/01/12 16:19:51 tgl Exp $
2+
# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.53 2005/01/15 04:15:51 tgl Exp $
33

44
me=`basename$0`
55
:${TMPDIR=/tmp}
@@ -192,11 +192,10 @@ esac
192192

193193

194194
# ----------
195-
#When on QNX or BeOS, don't use Unix sockets.
195+
#On some platforms we can't use Unix sockets.
196196
# ----------
197-
198197
case$host_platformin
199-
*-*-qnx* |*beos*)
198+
*-*-cygwin* |*-*-mingw32* |*-*-qnx* |*beos*)
200199
unix_sockets=no;;
201200
*)
202201
unix_sockets=yes;;
@@ -309,7 +308,7 @@ then
309308
case$host_platformin
310309
*-*-mingw32*)
311310
pkglibdir="`pwd -W`/$temp_install/install/$pkglibdir"
312-
temp_install="`pwd`/$temp_install"
311+
temp_install="`pwd`/$temp_install"
313312
;;
314313
*)
315314
temp_install="`pwd`/$temp_install"
@@ -418,9 +417,9 @@ then
418417
message"starting postmaster"
419418
["$debug"= yes ]&& postmaster_options="$postmaster_options -d 5"
420419
if ["$unix_sockets"= no ];then
421-
postmaster_options="$postmaster_options -c listen_addresses=$hostname"
420+
postmaster_options="$postmaster_options -c listen_addresses=$hostname"
422421
else
423-
postmaster_options="$postmaster_options -c listen_addresses=''"
422+
postmaster_options="$postmaster_options -c listen_addresses=''"
424423
fi
425424
"$bindir/postmaster" -D"$PGDATA" -F$postmaster_options>"$LOGDIR/postmaster.log"2>&1&
426425
postmaster_pid=$!
@@ -470,13 +469,6 @@ else # not temp-install
470469
;;
471470
esac
472471

473-
# If Unix sockets are not available, use the local host by default.
474-
if ["$unix_sockets"= no ];then
475-
PGHOST=$hostname
476-
export PGHOST
477-
unset PGHOSTADDR
478-
fi
479-
480472
if [-n"$PGPORT" ];then
481473
port_info="port$PGPORT"
482474
else
@@ -486,15 +478,13 @@ else # not temp-install
486478
if [-n"$PGHOST" ];then
487479
echo"(using postmaster on$PGHOST,$port_info)"
488480
else
489-
case$host_platformin
490-
*-*-mingw32*)
491-
echo"(using postmaster on localhost socket,$port_info)"
492-
;;
493-
*)
494-
echo"(using postmaster on Unix socket,$port_info)"
495-
;;
496-
esac
481+
if ["$unix_sockets"= no ];then
482+
echo"(using postmaster on localhost,$port_info)"
483+
else
484+
echo"(using postmaster on Unix socket,$port_info)"
485+
fi
497486
fi
487+
498488
message"dropping database\"$dbname\""
499489
"$bindir/dropdb"$psql_options"$dbname"
500490
# errors can be ignored
@@ -634,7 +624,7 @@ do
634624
formatted=`echo$1| awk'{printf "%-20.20s", $1;}'`
635625
$ECHO_N"test$formatted ...$ECHO_C"
636626
($PSQL -d"$dbname"<"$inputdir/sql/$1.sql">"$outputdir/results/$1.out"2>&1 )&
637-
wait
627+
wait
638628
else
639629
# Start a parallel group
640630
$ECHO_N"parallel group ($# tests):$ECHO_C"

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp