Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mobGg-0006Nu-3n for pgsql-committers@arkaria.postgresql.org; Sun, 21 Nov 2021 01:03:42 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mobGe-0001jX-0i for pgsql-committers@arkaria.postgresql.org; Sun, 21 Nov 2021 01:03:40 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mobGd-0001jO-Pf for pgsql-committers@lists.postgresql.org; Sun, 21 Nov 2021 01:03:39 +0000 Received: from sss.pgh.pa.us ([66.207.139.130]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mobGX-0008Ee-Uq for pgsql-committers@lists.postgresql.org; Sun, 21 Nov 2021 01:03:39 +0000 Received: from sss1.sss.pgh.pa.us (localhost [127.0.0.1]) by sss.pgh.pa.us (8.15.2/8.15.2) with ESMTP id 1AL13TRu3385669; Sat, 20 Nov 2021 20:03:29 -0500 From: Tom Lane To: Noah Misch cc: Andrew Dunstan , pgsql-committers@lists.postgresql.org Subject: Re: pgsql: Require version 0.98 of Test::More for TAP tests In-reply-to: <3371085.1637455802@sss.pgh.pa.us> References: <3369543.1637454364@sss.pgh.pa.us> <3369927.1637454743@sss.pgh.pa.us> <20211121003630.GA1362012@rfd.leadboat.com> <3371085.1637455802@sss.pgh.pa.us> Comments: In-reply-to Tom Lane message dated "Sat, 20 Nov 2021 19:50:02 -0500" MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-ID: <3385645.1637456589.0@sss.pgh.pa.us> Date: Sat, 20 Nov 2021 20:03:29 -0500 Message-ID: <3385668.1637456609@sss.pgh.pa.us> List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="us-ascii" Content-ID: <3385645.1637456589.1@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 ------- =_aaaaaaaaaa0 Content-Type: text/x-diff; name="find-the-right-version-of-prove.patch"; charset="us-ascii" Content-ID: <3385645.1637456589.2@sss.pgh.pa.us> Content-Description: find-the-right-version-of-prove.patch Content-Transfer-Encoding: quoted-printable diff --git a/configure b/configure index 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=3D"$PATH" + PATH=3D"`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=3D"$save_PATH" if test -z "$PROVE"; then as_fn_error $? "prove not found" "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 95e5169c4f..8a70ca16ef 100644 --- a/configure.ac +++ b/configure.ac @@ -2389,8 +2389,12 @@ if test "$enable_tap_tests" =3D yes; then AX_PROG_PERL_MODULES([IPC::Run=3D0.79 Test::More=3D0.98 Time::HiRes=3D= 1.52], , [AC_MSG_ERROR([Additional Perl modules are required to run TAP test= s])]) 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=3D"$PATH" + PATH=3D"`dirname "$PERL"`:$PATH" PGAC_PATH_PROGS(PROVE, prove) + PATH=3D"$save_PATH" if test -z "$PROVE"; then AC_MSG_ERROR([prove not found]) fi ------- =_aaaaaaaaaa0--