Treat MINGW and MSYS the same in pg_upgrade test script

On msys2, 'uname -s' reports a string starting MSYS instead on MINGW
as happens on msys1. Treat these both the same way. This reverts
608a710195a4b in favor of a more general solution.

Backpatch to all live branches.
This commit is contained in:
Andrew Dunstan 2019-08-26 07:44:34 -04:00
parent 71d84efba7
commit acb96eb7d2

View File

@ -31,11 +31,13 @@ standard_initdb() {
../../test/regress/pg_regress --config-auth "$PGDATA" ../../test/regress/pg_regress --config-auth "$PGDATA"
} }
# Establish how the server will listen for connections # What flavor of host are we on?
testhost=`uname -s` # Treat MINGW* (msys1) and MSYS* (msys2) the same.
testhost=`uname -s | sed s/^MSYS/MINGW/`
# Establish how the server will listen for connections
case $testhost in case $testhost in
MINGW*|MSYS*) MINGW*)
LISTEN_ADDRESSES="localhost" LISTEN_ADDRESSES="localhost"
PGHOST=localhost PGHOST=localhost
;; ;;