c8h4/postgresql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a temp-install prerequisite to "check"-like targets not having one.

Browse source 
Makefile.global assigns this prerequisite to every target named "check",
but similar targets must mention it explicitly.  Affected targets
failed, tested $PATH binaries, or tested a stale temporary installation.
The src/test/modules examples worked properly when called as "make -C
src/test/modules/$FOO check", but "make -j" allowed the test to start
before the temporary installation was in place.  Back-patch to 9.5,
where commit dcae5facca introduced the
shared temp-install.
This commit is contained in:
Noah Misch 2017-11-05 18:51:08 -08:00
parent b35b185bf7
commit c66b438db6
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/interfaces/ecpg/test/Makefile
View file

@ -81,7 +81,7 @@ check: all
$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
# the same options, but with --listen-on-tcp # the same options, but with --listen-on-tcp
checktcp: all checktcp: all | temp-install
$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
installcheck: all installcheck: all
@ -95,5 +95,5 @@ installcheck: all
installcheck-prepared-txns: all installcheck-prepared-txns: all
./pg_regress $(REGRESS_OPTS) --bindir='$(bindir)' $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase ./pg_regress $(REGRESS_OPTS) --bindir='$(bindir)' $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
check-prepared-txns: all check-prepared-txns: all | temp-install
$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase

1
src/test/locale/Makefile
View file

@ -16,5 +16,6 @@ clean distclean maintainer-clean:
$(MAKE) -C $$d clean || exit; \ $(MAKE) -C $$d clean || exit; \
done done
# These behave like installcheck targets.
check-%: all check-%: all
@$(MAKE) -C `echo $@ | sed 's/^check-//'` test @$(MAKE) -C `echo $@ | sed 's/^check-//'` test

4
src/test/modules/brin/Makefile
View file

@ -21,13 +21,13 @@ endif
check: isolation-check prove-check check: isolation-check prove-check
isolation-check: | submake-isolation isolation-check: | submake-isolation temp-install
$(MKDIR_P) isolation_output $(MKDIR_P) isolation_output
$(pg_isolation_regress_check) \ $(pg_isolation_regress_check) \
--outputdir=./isolation_output \ --outputdir=./isolation_output \
$(ISOLATIONCHECKS) $(ISOLATIONCHECKS)
prove-check: prove-check: | temp-install
$(prove_check) $(prove_check)
.PHONY: check isolation-check prove-check .PHONY: check isolation-check prove-check

2
src/test/modules/commit_ts/Makefile
View file

@ -16,5 +16,5 @@ endif
check: prove-check check: prove-check
prove-check: prove-check: | temp-install
$(prove_check) $(prove_check)

2
src/test/modules/test_pg_dump/Makefile
View file

@ -21,5 +21,5 @@ endif
check: prove-check check: prove-check
prove-check: prove-check: | temp-install
$(prove_check) $(prove_check)

4
src/test/regress/GNUmakefile
View file

@ -129,7 +129,7 @@ REGRESS_OPTS = --dlpath=. --max-concurrent-tests=20 $(EXTRA_REGRESS_OPTS)
check: all tablespace-setup check: all tablespace-setup
$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS) $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
check-tests: all tablespace-setup check-tests: all tablespace-setup | temp-install
$(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TESTS) $(EXTRA_TESTS) $(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TESTS) $(EXTRA_TESTS)
installcheck: all tablespace-setup installcheck: all tablespace-setup
@ -153,7 +153,7 @@ runtest-parallel: installcheck-parallel
bigtest: all tablespace-setup bigtest: all tablespace-setup
$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big $(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
bigcheck: all tablespace-setup bigcheck: all tablespace-setup | temp-install
$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big