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

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 dcae5faccab64776376d354decda0017c648bb53 introduced the
shared temp-install.

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index a4ac02107c801e5e33266291b23cf79bca18f3aa..d13742256e69a57c812fc25e89a99e0658780c50 100644 (file)
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -81,7 +81,7 @@ check: all
    $(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule
 
 # 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 --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
 
 installcheck: all

diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile
index 26ec5c9a904c231e8636dc96834a5d9be191d15f..22a45b65f2c76bfdebfa1092b340dc16576a6d49 100644 (file)
--- a/src/test/locale/Makefile
+++ b/src/test/locale/Makefile
@@ -16,5 +16,6 @@ clean distclean maintainer-clean:
        $(MAKE) -C $$d clean || exit; \
    done
 
+# These behave like installcheck targets.
 check-%: all
    @$(MAKE) -C `echo $@ | sed 's/^check-//'` test

diff --git a/src/test/modules/brin/Makefile b/src/test/modules/brin/Makefile
index dda84c23c781d20441735b4e1a6c2b0e9316c3a0..2c51c6692485fd460e945acef51380cb83e74151 100644 (file)
--- a/src/test/modules/brin/Makefile
+++ b/src/test/modules/brin/Makefile
@@ -18,7 +18,7 @@ endif
 
 check: isolation-check
 
-isolation-check: | submake-isolation
+isolation-check: | submake-isolation temp-install
    $(MKDIR_P) isolation_output
    $(pg_isolation_regress_check) \
        --outputdir=./isolation_output \

diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index 4d6849e34e535a0b48c6e219e5228d042a056db8..487d6589b452e17e5fb34445df544dbbb2c20ca3 100644 (file)
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -133,7 +133,7 @@ REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS)
 check: all tablespace-setup
    $(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS)
 
-check-tests: all tablespace-setup
+check-tests: all tablespace-setup | temp-install
    $(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TEMP_CONF) $(TESTS) $(EXTRA_TESTS)
 
 installcheck: all tablespace-setup
@@ -157,7 +157,7 @@ runtest-parallel: installcheck-parallel
 bigtest: all tablespace-setup
    $(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