postgres.git / summary / log / commit / refs

commit    01c5ef99cc0c2a193c7446515a40d85fdccc498e
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Mon Aug 26 11:44:34 2019 +0000
First released in: 13.0, 9.4.25, 9.5.20, 9.6.16, 10.11, 11.6, 12.0

    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 5e14ede712d..dddba8c8568 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
 		;;


[parent: 4fca1460099e]