From 33066b0142893ead9b1bd9709552a9f173ffddb3 Mon Sep 17 00:00:00 2001 From: Andrew Dunstan Date: Mon, 26 Aug 2019 07:44:34 -0400 Subject: [PATCH] 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. --- src/bin/pg_upgrade/test.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index 3f98158dde..30e5eedc6d 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 ;; -- 2.40.0