database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-17 17:02:08 +03:00
Code Activity

Fix previous commit for TAP test suites in VPATH builds.

Browse Source 
Per buildfarm member crake.  Back-patch to 9.4, where the TAP suites
were introduced.
This commit is contained in:
Noah Misch
2014-12-18 01:24:57 -05:00
parent 6b87d423dc
commit e35e76a8f4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.global.in
View File

@ -323,7 +323,7 @@ endef
define prove_check define prove_check
$(MKDIR_P) tmp_check/log $(MKDIR_P) tmp_check/log
$(MAKE) -C $(top_builddir) DESTDIR='$(CURDIR)'/tmp_check/install install >'$(CURDIR)'/tmp_check/log/install.log 2>&1 $(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 endef
else else

2
src/bin/pg_ctl/t/001_start_stop.pl
View File

@ -12,7 +12,7 @@ program_options_handling_ok('pg_ctl');
command_ok([ 'pg_ctl', 'initdb', '-D', "$tempdir/data" ], 'pg_ctl initdb'); command_ok([ 'pg_ctl', 'initdb', '-D', "$tempdir/data" ], 'pg_ctl initdb');
command_ok( command_ok(
[ "$ENV{top_srcdir}/src/test/regress/pg_regress", '--config-auth', [ "$ENV{top_builddir}/src/test/regress/pg_regress", '--config-auth',
"$tempdir/data" ], "$tempdir/data" ],
'configure authentication'); 'configure authentication');
open CONF, ">>$tempdir/data/postgresql.conf"; open CONF, ">>$tempdir/data/postgresql.conf";

2
src/test/perl/TestLib.pm
View File

@ -74,7 +74,7 @@ sub standard_initdb
{ {
my $pgdata = shift; my $pgdata = shift;
system_or_bail("initdb -D '$pgdata' -A trust -N >/dev/null"); 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); '--config-auth', $pgdata);
} }