From: Tom Lane <tgl@sss.pgh.pa.us>
To: Noah Misch <noah@leadboat.com>
Cc: Andrew Dunstan <andrew@dunslane.net>
Cc: pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Require version 0.98 of Test::More for TAP tests
Date: Sat, 20 Nov 2021 20:03:29 -0500
Message-ID: <3385668.1637456609@sss.pgh.pa.us> (raw)
In-Reply-To: <3371085.1637455802@sss.pgh.pa.us>
References: <E1moZHS-0002Cu-Ei@gemulon.postgresql.org>
<3369543.1637454364@sss.pgh.pa.us>
<3369927.1637454743@sss.pgh.pa.us>
<20211121003630.GA1362012@rfd.leadboat.com>
<3371085.1637455802@sss.pgh.pa.us>
I wrote:
> What I'm inclined to do is temporarily push `dirname $PERL` onto the front
> of PATH while running
> PGAC_PATH_PROGS(PROVE, prove)
The attached seems like it will work. I think we want to backpatch
this, since the wrong-PROVE hazard is the same in all branches.
regards, tom lane
Attachments:find-the-right-version-of-prove.patch (text/x-diff, 1.3K) downloaddiff --git a/configure b/configureindex 977b4d3df5..6789b09d03 100755--- a/configure+++ b/configure@@ -19501,7 +19501,10 @@ else
$as_echo "$as_me: WARNING: could not find perl" >&2;}
fi
fi
- # Now make sure we know where prove is+ # Now make sure we know where prove is.+ # Prefer to find prove in the same directory as perl.+ save_PATH="$PATH"+ PATH="`dirname "$PERL"`:$PATH"
if test -z "$PROVE"; then
for ac_prog in prove
do
@@ -19556,6 +19559,7 @@ $as_echo_n "checking for PROVE... " >&6; }
$as_echo "$PROVE" >&6; }
fi
+ PATH="$save_PATH"
if test -z "$PROVE"; then
as_fn_error $? "prove not found" "$LINENO" 5
fi
diff --git a/configure.ac b/configure.acindex 95e5169c4f..8a70ca16ef 100644--- a/configure.ac+++ b/configure.ac@@ -2389,8 +2389,12 @@ if test "$enable_tap_tests" = yes; then
AX_PROG_PERL_MODULES([IPC::Run=0.79 Test::More=0.98 Time::HiRes=1.52], ,
[AC_MSG_ERROR([Additional Perl modules are required to run TAP tests])])
fi
- # Now make sure we know where prove is+ # Now make sure we know where prove is.+ # Prefer to find prove in the same directory as perl.+ save_PATH="$PATH"+ PATH="`dirname "$PERL"`:$PATH"
PGAC_PATH_PROGS(PROVE, prove)
+ PATH="$save_PATH"
if test -z "$PROVE"; then
AC_MSG_ERROR([prove not found])
fi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: pgsql-committers@postgresql.org
Cc: tgl@sss.pgh.pa.us, noah@leadboat.com, andrew@dunslane.net, pgsql-committers@lists.postgresql.org
Subject: Re: pgsql: Require version 0.98 of Test::More for TAP tests
In-Reply-To: <3385668.1637456609@sss.pgh.pa.us>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox