mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add module build directory to the PATH for TAP tests

Browse Source 
For non-MSVC builds this is make's $(CURDIR), while for MSVC builds it
is $topdir/$Config/$module. The directory is added as the second element
in the PATH, so that the install location takes precedence, but the
added PATH element takes precedence over the rest of the PATH.

The reason for this is to allow tests to find built products that are
not installed, such as the libpq_pipeline test driver.

The libpq_pipeline test is adjusted to take advantage of this.

Based on a suggestion from Andres Freund.

Backpatch to release 14.

Discussion: https://postgr.es/m/4941f5a5-2d50-1a0e-6701-14c5fefe92d6@dunslane.net
This commit is contained in:
Andrew Dunstan 2021-10-22 09:11:52 -04:00
parent b1ce6c2843
commit f4ce6c4d3a
No known key found for this signature in database
GPG Key ID: 99FA7FCB59FC3B81
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile.global.in
View File

@ -438,7 +438,7 @@ ld_library_path_var = LD_LIBRARY_PATH
# need something more here. If not defined then the expansion does # need something more here. If not defined then the expansion does
# nothing. # nothing.
with_temp_install = \ with_temp_install = \
PATH="$(abs_top_builddir)/tmp_install$(bindir):$$PATH" \ PATH="$(abs_top_builddir)/tmp_install$(bindir):$(CURDIR):$$PATH" \
$(call add_to_path,$(strip $(ld_library_path_var)),$(abs_top_builddir)/tmp_install$(libdir)) \ $(call add_to_path,$(strip $(ld_library_path_var)),$(abs_top_builddir)/tmp_install$(libdir)) \
$(with_temp_install_extra) $(with_temp_install_extra)
@ -449,8 +449,8 @@ define prove_installcheck
rm -rf '$(CURDIR)'/tmp_check rm -rf '$(CURDIR)'/tmp_check
$(MKDIR_P) '$(CURDIR)'/tmp_check $(MKDIR_P) '$(CURDIR)'/tmp_check
cd $(srcdir) && \ cd $(srcdir) && \
TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' \ TESTDIR='$(CURDIR)' PATH="$(bindir):$(CURDIR):$$PATH" \
top_builddir='$(CURDIR)/$(top_builddir)' \ PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)' \
PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \ PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl) $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
endef endef
@ -459,8 +459,8 @@ define prove_installcheck
rm -rf '$(CURDIR)'/tmp_check rm -rf '$(CURDIR)'/tmp_check
$(MKDIR_P) '$(CURDIR)'/tmp_check $(MKDIR_P) '$(CURDIR)'/tmp_check
cd $(srcdir) && \ cd $(srcdir) && \
TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' \ TESTDIR='$(CURDIR)' PATH="$(bindir):$(CURDIR):$$PATH" \
top_builddir='$(top_builddir)' \ PGPORT='6$(DEF_PGPORT)' top_builddir='$(top_builddir)' \
PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \ PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \
$(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl) $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
endef endef

5
src/test/modules/libpq_pipeline/t/001_libpq_pipeline.pl
View File

@ -14,9 +14,8 @@ $node->init;
$node->start; $node->start;
my $numrows = 700; 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 ''; die "oops: $err" unless $err eq '';
my @tests = split(/\s+/, $out); my @tests = split(/\s+/, $out);
@ -39,7 +38,7 @@ for my $testname (@tests)
# Execute the test # Execute the test
$node->command_ok( $node->command_ok(
[ [
$libpq_pipeline, @extraargs, 'libpq_pipeline', @extraargs,
$testname, $node->connstr('postgres') $testname, $node->connstr('postgres')
], ],
"libpq_pipeline $testname"); "libpq_pipeline $testname");

3
src/tools/msvc/vcregress.pl
View File

@ -248,6 +248,9 @@ sub tap_check
$ENV{REGRESS_SHLIB} = "$topdir/src/test/regress/regress.dll"; $ENV{REGRESS_SHLIB} = "$topdir/src/test/regress/regress.dll";
$ENV{TESTDIR} = "$dir"; $ENV{TESTDIR} = "$dir";
my $module = basename $dir;
# add the module build dir as the second element in the PATH
$ENV{PATH} =~ s!;!;$topdir/$Config/$module;!;
rmtree('tmp_check'); rmtree('tmp_check');
system(@args); system(@args);