NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit01c5ef9

committed

Treat MINGW and MSYS the same in pg_upgrade test script

On msys2, 'uname -s' reports a string starting MSYS instead on MINGWas happens on msys1. Treat these both the same way. This reverts608a710 in favor of a more general solution.Backpatch to all live branches.

1 parent4fca146 commit01c5ef9Copy full SHA for 01c5ef9

File tree

1 file changed

-3

lines changed

src/bin/pg_upgrade
- test.sh

1 file changed

-3

lines changed

`‎src/bin/pg_upgrade/test.sh`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,13 @@ standard_initdb() {`
`29`	`29`	`../../test/regress/pg_regress --config-auth"$PGDATA"`
`30`	`30`	`}`
`31`	`31`
`32`		`-# Establish how the server will listen for connections`
`33`		-testhost=`uname -s`
	`32`	`+# What flavor of host are we on?`
	`33`	`+# Treat MINGW* (msys1) and MSYS* (msys2) the same.`
	`34`	+testhost=`uname -s\| sed s/^MSYS/MINGW/`
`34`	`35`
	`36`	`+# Establish how the server will listen for connections`
`35`	`37`	`case$testhostin`
`36`		`-MINGW\|MSYS)`
	`38`	`+MINGW*)`
`37`	`39`	`LISTEN_ADDRESSES="localhost"`
`38`	`40`	`PGHOST=localhost`
`39`	`41`	`;;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit01c5ef9

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/test.sh`

0 commit comments