Commit40c598f

committed

Fix previous commit for TAP test suites in VPATH builds.

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

1 parentf6dc6dd commit40c598fCopy full SHA for 40c598f

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ endef`
`323`	`323`	`defineprove_check`
`324`	`324`	`$(MKDIR_P) tmp_check/log`
`325`	`325`	`$(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`
`327`	`327`	`endef`
`328`	`328`
`329`	`329`	`else`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`command_ok(['pg_ctl','initdb','-D',"$tempdir/data" ],'pg_ctl initdb');`
`17`	`17`	`command_ok(`
`18`		`-["$ENV{top_srcdir}/src/test/regress/pg_regress",'--config-auth',`
	`18`	`+["$ENV{top_builddir}/src/test/regress/pg_regress",'--config-auth',`
`19`	`19`	`"$tempdir/data" ],`
`20`	`20`	`'configure authentication');`
`21`	`21`	`open CONF,">>$tempdir/data/postgresql.conf";`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ sub standard_initdb`
`74`	`74`	`{`
`75`	`75`	`my$pgdata =shift;`
`76`	`76`	`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",`
`78`	`78`	`'--config-auth',$pgdata);`
`79`	`79`	`}`
`80`	`80`

Comments

(0)