Skip to content

Commit 014c5cd

Browse files
committed
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 dcae5fa introduced the shared temp-install.
1 parent 4dc03c8 commit 014c5cd

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

src/interfaces/ecpg/test/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ check: all
8181
$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule
8282

8383
# the same options, but with --listen-on-tcp
84-
checktcp: all
84+
checktcp: all | temp-install
8585
$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
8686

8787
installcheck: all

src/test/locale/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ clean distclean maintainer-clean:
1616
$(MAKE) -C $$d clean || exit; \
1717
done
1818

19+
# These behave like installcheck targets.
1920
check-%: all
2021
@$(MAKE) -C `echo $@ | sed 's/^check-//'` test

src/test/modules/brin/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ endif
1818

1919
check: isolation-check
2020

21-
isolation-check: | submake-isolation
21+
isolation-check: | submake-isolation temp-install
2222
$(MKDIR_P) isolation_output
2323
$(pg_isolation_regress_check) \
2424
--outputdir=./isolation_output \

src/test/regress/GNUmakefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS)
133133
check: all tablespace-setup
134134
$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(TEMP_CONF) $(EXTRA_TESTS)
135135

136-
check-tests: all tablespace-setup
136+
check-tests: all tablespace-setup | temp-install
137137
$(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TEMP_CONF) $(TESTS) $(EXTRA_TESTS)
138138

139139
installcheck: all tablespace-setup
@@ -157,7 +157,7 @@ runtest-parallel: installcheck-parallel
157157
bigtest: all tablespace-setup
158158
$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
159159

160-
bigcheck: all tablespace-setup
160+
bigcheck: all tablespace-setup | temp-install
161161
$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
162162

163163

0 commit comments

Comments
 (0)