diff options
| author | Andres Freund | 2019-05-23 21:46:57 +0000 |
|---|---|---|
| committer | Andres Freund | 2019-05-23 21:50:04 +0000 |
| commit | 5518293475f853f0ecd6eaf8c02e454314e9c81e (patch) | |
| tree | e107c4d39525825472d54fd1103c250c48d944a3 | |
| parent | c82e8ba0016319bb7c18ace7a9a77a7d7550f997 (diff) | |
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 be
installed into a temporary directory. As commonly the case when just
executing make check for pg_upgrade, as $oldbindir is just the current
version's $bindir.
In the back branches, with --install specified, psql from the new
version's temporary installation was used, without --install (e.g for
NO_TEMP_INSTALL, cf 47b3c26642), the new version's installed psql was
used (which might or might not exist).
Author: Andres Freund
Discussion: https://postgr.es/m/20190522175150.c26f4jkqytahajdg@alap3.anarazel.de
| -rw-r--r-- | src/bin/pg_upgrade/test.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh index eef6be2a5c6..6681e0a04ff 100644 --- a/src/bin/pg_upgrade/test.sh +++ b/src/bin/pg_upgrade/test.sh @@ -82,14 +82,6 @@ if [ "$1" = '--install' ]; then LIBPATH=$libdir:$LIBPATH export LIBPATH PATH=$libdir:$PATH - - # We need to make it use psql from our temporary installation, - # because otherwise the installcheck run below would try to - # use psql from the proper installation directory, which might - # be outdated or missing. But don't override anything else that's - # already in EXTRA_REGRESS_OPTS. - EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --bindir='$bindir'" - export EXTRA_REGRESS_OPTS fi : ${oldbindir=$bindir} @@ -98,6 +90,14 @@ fi oldsrc=`cd "$oldsrc" && pwd` newsrc=`cd ../../.. && pwd` +# We need to make pg_regress use psql from the desired installation +# (likely a temporary one), because otherwise the installcheck run +# below would try to use psql from the proper installation directory +# of the target version, which might be outdated or not exist. But +# don't override anything else that's already in EXTRA_REGRESS_OPTS. +EXTRA_REGRESS_OPTS="$EXTRA_REGRESS_OPTS --bindir='$oldbindir'" +export EXTRA_REGRESS_OPTS + PATH=$bindir:$PATH export PATH |