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 1mdJ7a-0008RD-0v for pgsql-committers@arkaria.postgresql.org; Wed, 20 Oct 2021 21:27:38 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mdJ7Y-0001iP-HO for pgsql-committers@arkaria.postgresql.org; Wed, 20 Oct 2021 21:27:36 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mdJ7Y-0001iG-Ak for pgsql-committers@lists.postgresql.org; Wed, 20 Oct 2021 21:27:36 +0000 Received: from relay9-d.mail.gandi.net ([217.70.183.199]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mdJ7V-0007Yi-Ir for pgsql-committers@lists.postgresql.org; Wed, 20 Oct 2021 21:27:35 +0000 Received: (Authenticated sender: adsend@dunslane.net) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 37045FF807; Wed, 20 Oct 2021 21:27:28 +0000 (UTC) Subject: Re: pgsql: Reference test binary using TESTDIR in 001_libpq_pipeline.pl. To: Andres Freund Cc: Alvaro Herrera , pgsql-committers@lists.postgresql.org References: <202110181423.cmd34pruwlry@alvherre.pgsql> <20211020163123.adogznqee7oosvj5@alap3.anarazel.de> <1ccbc9a2-1e0f-93bf-745d-99b3409e10ae@dunslane.net> <20211020190916.bzvnmo6kxeqehczv@alap3.anarazel.de> From: Andrew Dunstan Message-ID: Date: Wed, 20 Oct 2021 17:27:26 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20211020190916.bzvnmo6kxeqehczv@alap3.anarazel.de> Content-Type: multipart/mixed; boundary="------------7489CB677BA2776970E91E6A" Content-Language: en-US List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------7489CB677BA2776970E91E6A Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 10/20/21 3:09 PM, Andres Freund wrote: > Hi, > > On 2021-10-20 14:30:49 -0400, Andrew Dunstan wrote: >> On 10/20/21 12:31 PM, Andres Freund wrote: >>> ISTM that we should just make the "test invocation framework" responsible to >>> put the relevant directory onto PATH? I.e. Makefile.global should add the >>> build directory of the test to PATH, and vcregress.pl should put the relevant >>> $configuration/$project/ directory there? >> Like this? That seems reasonable. > Yea, that's along the lines of what I was thinking... > OK, it turns out that it's better to put the addition at the end of the PATH, otherise initdb complains that it can't find postgres in the same directory. This patch has been tested on Linux but not yet on Windows/MSVC, although I have little doubt it will work there too. cheers andrew -- Andrew Dunstan EDB: https://www.enterprisedb.com --------------7489CB677BA2776970E91E6A Content-Type: text/x-patch; charset=UTF-8; name="libpq_pipeline_fix4.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="libpq_pipeline_fix4.patch" diff --git a/src/Makefile.global.in b/src/Makefile.global.in index a1da1ea4ee..5ff5c0c1a1 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -438,7 +438,7 @@ ld_library_path_var = LD_LIBRARY_PATH # need something more here. If not defined then the expansion does # nothing. with_temp_install = \ - PATH="$(abs_top_builddir)/tmp_install$(bindir):$$PATH" \ + PATH="$(abs_top_builddir)/tmp_install$(bindir):$$PATH:$(CURDIR)" \ $(call add_to_path,$(strip $(ld_library_path_var)),$(abs_top_builddir)/tmp_install$(libdir)) \ $(with_temp_install_extra) @@ -449,8 +449,8 @@ define prove_installcheck rm -rf '$(CURDIR)'/tmp_check $(MKDIR_P) '$(CURDIR)'/tmp_check cd $(srcdir) && \ - TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' \ - top_builddir='$(CURDIR)/$(top_builddir)' \ + TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH:$(CURDIR)" \ + PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)' \ PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \ $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl) endef @@ -459,8 +459,8 @@ define prove_installcheck rm -rf '$(CURDIR)'/tmp_check $(MKDIR_P) '$(CURDIR)'/tmp_check cd $(srcdir) && \ - TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' \ - top_builddir='$(top_builddir)' \ + TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH:$(CURDIR)" \ + PGPORT='6$(DEF_PGPORT)' top_builddir='$(top_builddir)' \ PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \ $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl) endef diff --git a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl index 6721edfa71..7f648b19a2 100644 --- a/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl +++ b/src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl @@ -14,9 +14,8 @@ $node->init; $node->start; my $numrows = 700; -my $libpq_pipeline = "$ENV{TESTDIR}/libpq_pipeline"; -my ($out, $err) = run_command([ $libpq_pipeline, 'tests' ]); +my ($out, $err) = run_command([ 'libpq_pipeline', 'tests' ]); die "oops: $err" unless $err eq ''; my @tests = split(/\s+/, $out); @@ -39,8 +38,8 @@ for my $testname (@tests) # Execute the test $node->command_ok( [ - $libpq_pipeline, @extraargs, - $testname, $node->connstr('postgres') + 'libpq_pipeline', @extraargs, + $testname, $node->connstr('postgres') ], "libpq_pipeline $testname"); diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl index 35e8f67f01..2ed8de4aad 100644 --- a/src/tools/msvc/vcregress.pl +++ b/src/tools/msvc/vcregress.pl @@ -248,6 +248,8 @@ sub tap_check $ENV{REGRESS_SHLIB} = "$topdir/src/test/regress/regress.dll"; $ENV{TESTDIR} = "$dir"; + my $module = basename $dir; + $ENV{PATH} = "$ENV{PATH};$topdir/$Config/$module"; rmtree('tmp_check'); system(@args); --------------7489CB677BA2776970E91E6A--