Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5d91a9e

Browse files
committed
pg_upgrade: Make test.sh's installcheck use to-be-upgraded version's bindir.
On master (after 700538) the old version's installed psql was used -even when the old version might not actually be installed / might beinstalled into a temporary directory. As commonly the case when justexecuting make check for pg_upgrade, as $oldbindir is just the currentversion's $bindir.In the back branches, with --install specified, psql from the newversion's temporary installation was used, without --install (e.g forNO_TEMP_INSTALL, cf47b3c26), the new version's installed psql wasused (which might or might not exist).Author: Andres FreundDiscussion:https://postgr.es/m/20190522175150.c26f4jkqytahajdg@alap3.anarazel.de
1 parentf7da492 commit5d91a9e

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

‎src/bin/pg_upgrade/test.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,6 @@ if [ "$1" = '--install' ]; then
8686
SHLIB_PATH=$libdir:$SHLIB_PATH
8787
export SHLIB_PATH
8888
PATH=$libdir:$PATH
89-
90-
# We need to make it use psql from our temporary installation,
91-
# because otherwise the installcheck run below would try to
92-
# use psql from the proper installation directory, which might
93-
# be outdated or missing. But don't override anything else that's
94-
# already in EXTRA_REGRESS_OPTS.
95-
EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --bindir='$bindir'"
96-
export EXTRA_REGRESS_OPTS
9789
fi
9890

9991
:${oldbindir=$bindir}
@@ -102,6 +94,14 @@ fi
10294
oldsrc=`cd"$oldsrc"&& pwd`
10395
newsrc=`cd ../../..&& pwd`
10496

97+
# We need to make pg_regress use psql from the desired installation
98+
# (likely a temporary one), because otherwise the installcheck run
99+
# below would try to use psql from the proper installation directory
100+
# of the target version, which might be outdated or not exist. But
101+
# don't override anything else that's already in EXTRA_REGRESS_OPTS.
102+
EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --bindir='$oldbindir'"
103+
export EXTRA_REGRESS_OPTS
104+
105105
PATH=$bindir:$PATH
106106
export PATH
107107

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp