diff options
| author | Noah Misch <noah@leadboat.com> | 2014-12-18 01:24:57 -0500 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2014-12-18 01:25:13 -0500 |
| commit | e35e76a8f486aa397cd27f7e5104e7f0eedda877 (patch) | |
| tree | 22de3c34e460321d69a3fcb9f0a9f4401c3830a7 | |
| parent | 6b87d423dc6188a0fed4331bc5c8e4c9c88263d1 (diff) | |
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.
| -rw-r--r-- | src/Makefile.global.in | 2 | ||||
| -rw-r--r-- | src/bin/pg_ctl/t/001_start_stop.pl | 2 | ||||
| -rw-r--r-- | src/test/perl/TestLib.pm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index f9ce7e4dcc2..d1f2049b329 100644 --- 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 be76f314b0c..0f62c1439a7 100644 --- 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 57abdb92bf4..003cd9a2cca 100644 --- 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); } |