diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2019-08-26 07:44:34 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2019-08-26 07:47:41 -0400 |
| commit | 33066b0142893ead9b1bd9709552a9f173ffddb3 (patch) | |
| tree | 1e85eb9fa5407b9ad430f42e161792ebcca8253a | |
| parent | a21ec1a959ef2f7fcd14391c97a14f5f10630aff (diff) | |
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.
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index 3f98158dde3..30e5eedc6d8 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -29,11 +29,13 @@ standard_initdb() { ../../test/regress/pg_regress --config-auth "$PGDATA" } -# Establish how the server will listen for connections -testhost=`uname -s` +# What flavor of host are we on? +# 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 - MINGW*|MSYS*) + MINGW*) LISTEN_ADDRESSES="localhost" PGHOST=localhost ;; |