Fix previous commit for TAP test suites in VPATH builds.

Per buildfarm member crake.  Back-patch to 9.4, where the TAP suites
were introduced.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index f9ce7e4dcc20bc2975828ca8003a0b53aa1cad59..d1f2049b329fa16cd4859bc23a9c35032c174278 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -323,7 +323,7 @@ endef
 define prove_check
 $(MKDIR_P) tmp_check/log
 $(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1
-cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(CURDIR)/tmp_check/install$(bindir):$$PATH" $(call add_to_path,$(ld_library_path_var),$(CURDIR)/tmp_check/install$(libdir)) top_srcdir='$(top_srcdir)' PGPORT='6$(DEF_PGPORT)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl
+cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(CURDIR)/tmp_check/install$(bindir):$$PATH" $(call add_to_path,$(ld_library_path_var),$(CURDIR)/tmp_check/install$(libdir)) top_builddir='$(CURDIR)/$(top_builddir)' PGPORT='6$(DEF_PGPORT)' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) t/*.pl
 endef
 
 else

diff --git a/src/bin/pg_ctl/t/001_start_stop.pl b/src/bin/pg_ctl/t/001_start_stop.pl
index be76f314b0c7bca38dd52fcaa0b736d82dad1b18..0f62c1439a70737f6f1ef2bf8f78829b06cb5fc9 100644 (file)
--- a/src/bin/pg_ctl/t/001_start_stop.pl
+++ b/src/bin/pg_ctl/t/001_start_stop.pl
@@ -12,7 +12,7 @@ program_options_handling_ok('pg_ctl');
 
 command_ok([ 'pg_ctl', 'initdb', '-D', "$tempdir/data" ], 'pg_ctl initdb');
 command_ok(
-       [   "$ENV{top_srcdir}/src/test/regress/pg_regress", '--config-auth',
+       [   "$ENV{top_builddir}/src/test/regress/pg_regress", '--config-auth',
                "$tempdir/data" ],
        'configure authentication');
 open CONF, ">>$tempdir/data/postgresql.conf";

diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 57abdb92bf47442ada3a2ebe3a688ee77bd64eaf..003cd9a2cca9d56ad2ecdd4cf2a9b192939a6bba 100644 (file)
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -74,7 +74,7 @@ sub standard_initdb
 {
        my $pgdata = shift;
        system_or_bail("initdb -D '$pgdata' -A trust -N >/dev/null");
-       system_or_bail("$ENV{top_srcdir}/src/test/regress/pg_regress",
+       system_or_bail("$ENV{top_builddir}/src/test/regress/pg_regress",
                                   '--config-auth', $pgdata);
 }