Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 40c598f

Browse files
committed
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.
1 parent f6dc6dd commit 40c598f

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Makefile.global.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ endef
323323
define prove_check
324324
$(MKDIR_P) tmp_check/log
325325
$(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1
326-
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
326+
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
327327
endef
328328

329329
else

src/bin/pg_ctl/t/001_start_stop.pl

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
command_ok([ 'pg_ctl', 'initdb', '-D', "$tempdir/data" ], 'pg_ctl initdb');
1717
command_ok(
18-
[ "$ENV{top_srcdir}/src/test/regress/pg_regress", '--config-auth',
18+
[ "$ENV{top_builddir}/src/test/regress/pg_regress", '--config-auth',
1919
"$tempdir/data" ],
2020
'configure authentication');
2121
open CONF, ">>$tempdir/data/postgresql.conf";

src/test/perl/TestLib.pm

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ sub standard_initdb
7474
{
7575
my $pgdata = shift;
7676
system_or_bail("initdb -D '$pgdata' -A trust -N >/dev/null");
77-
system_or_bail("$ENV{top_srcdir}/src/test/regress/pg_regress",
77+
system_or_bail("$ENV{top_builddir}/src/test/regress/pg_regress",
7878
'--config-auth', $pgdata);
7979
}
8080

0 commit comments

Comments
 (0)