Commit6b04abd

committed

Run tap tests in src/interfaces/libpq.

To be able to run binaries in the test/ directory, prove_[install]check needto be executable in a single shell invocation, so that test/ can be added toPATH.Discussion:https://postgr.es/m/20220223203031.ezrd73ohvjgfksow@alap3.anarazel.de

1 parentac25173 commit6b04abdCopy full SHA for 6b04abd

File tree

+16

-8

lines changed

+16

-8

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -448,8 +448,8 @@ ifeq ($(enable_tap_tests),yes)`
`448`	`448`
`449`	`449`	`ifndefPGXS`
`450`	`450`	`defineprove_installcheck`
`451`		`-rm -rf '$(CURDIR)'/tmp_check`
`452`		`-$(MKDIR_P) '$(CURDIR)'/tmp_check`
	`451`	`+rm -rf '$(CURDIR)'/tmp_check && \`
	`452`	`+$(MKDIR_P) '$(CURDIR)'/tmp_check && \`
`453`	`453`	`cd$(srcdir) && \`
`454`	`454`	`TESTDIR='$(CURDIR)' PATH="$(bindir):$(CURDIR):$$PATH" \`
`455`	`455`	`PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)' \`
`@@ -458,8 +458,8 @@ cd $(srcdir) && \`
`458`	`458`	`endef`
`459`	`459`	`else# PGXS case`
`460`	`460`	`defineprove_installcheck`
`461`		`-rm -rf '$(CURDIR)'/tmp_check`
`462`		`-$(MKDIR_P) '$(CURDIR)'/tmp_check`
	`461`	`+rm -rf '$(CURDIR)'/tmp_check && \`
	`462`	`+$(MKDIR_P) '$(CURDIR)'/tmp_check && \`
`463`	`463`	`cd$(srcdir) && \`
`464`	`464`	`TESTDIR='$(CURDIR)' PATH="$(bindir):$(CURDIR):$$PATH" \`
`465`	`465`	`PGPORT='6$(DEF_PGPORT)' top_builddir='$(top_builddir)' \`
`@@ -469,8 +469,8 @@ endef`
`469`	`469`	`endif# PGXS`
`470`	`470`
`471`	`471`	`defineprove_check`
`472`		`-rm -rf '$(CURDIR)'/tmp_check`
`473`		`-$(MKDIR_P) '$(CURDIR)'/tmp_check`
	`472`	`+rm -rf '$(CURDIR)'/tmp_check && \`
	`473`	`+$(MKDIR_P) '$(CURDIR)'/tmp_check && \`
`474`	`474`	`cd$(srcdir) && \`
`475`	`475`	`TESTDIR='$(CURDIR)'$(with_temp_install) PGPORT='6$(DEF_PGPORT)' \`
`476`	`476`	`PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \`

Lines changed: 1 addition & 0 deletions

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,14 @@ install: all installdirs install-lib`
`137`	`137`	`$(INSTALL_DATA)$(srcdir)/pqexpbuffer.h'$(DESTDIR)$(includedir_internal)'`
`138`	`138`	`$(INSTALL_DATA)$(srcdir)/pg_service.conf.sample'$(DESTDIR)$(datadir)/pg_service.conf.sample'`
`139`	`139`
`140`		`-installcheck:`
`141`		`-$(MAKE) -Ctest$@`
	`140`	`+test-build:`
	`141`	`+$(MAKE) -Ctest all`
	`142`	`+`
	`143`	`+check: test-build all`
	`144`	`+PATH="$(CURDIR)/test:$$PATH"&&$(prove_check)`
	`145`	`+`
	`146`	`+installcheck: test-build all`
	`147`	`+PATH="$(CURDIR)/test:$$PATH"&&$(prove_installcheck)`
`142`	`148`
`143`	`149`	`installdirs: installdirs-lib`
`144`	`150`	`$(MKDIR_P)'$(DESTDIR)$(includedir)''$(DESTDIR)$(includedir_internal)''$(DESTDIR)$(datadir)'`
`@@ -153,6 +159,7 @@ uninstall: uninstall-lib`
`153`	`159`
`154`	`160`	`cleandistclean: clean-lib`
`155`	`161`	`$(MAKE) -Ctest$@`
	`162`	`+rm -rf tmp_check`
`156`	`163`	`rm -f$(OBJS) pthread.h libpq-refs-stamp`
`157`	`164`	`# Might be left over from a Win32 client-only build`
`158`	`165`	`rm -f pg_config_paths.h`

Comments

(0)