Fix previous commit for TAP test suites in VPATH builds.

nmisch · nmisch · commit 40c598fa15be · 2014-12-18T01:24:57.000-05:00
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
@@ -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
@@ -15,7 +15,7 @@
 
 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
@@ -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);
 }
 

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`