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 481a78f6c3fb20f065e3bb7509ebe9a8fd0e7d7f..a77b5f174426e26ff7f47c66cb6d400e74295338 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 fb3e7a0ea8248dfe608efd97845c11e213588e3b..17309e8fcb991b11b6136e52c633c0e09123ce00 100644 (file)
--- a/src/bin/pg_ctl/t/001_start_stop.pl
+++ b/src/bin/pg_ctl/t/001_start_stop.pl
@@ -15,7 +15,7 @@ command_exit_is([ 'pg_ctl', 'start', '-D', "$tempdir/nonexistent" ],
 
 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);
 }