Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit dbf2ec1

Browse filesBrowse files
peterepetere
committed
Fix parallel make risk with new check temp-install setup
The "check" target no longer needs to depend on "all", because it now runs "install" directly, which in turn depends on "all". Doing both will cause problems with parallel make, because two builds will run next to each other. Also remove the redirection of the temp-install output into a log file. This was appropriate when this was done from within pg_regress, but now it's just a regular make run, and especially with the above changes this will now take the place of running the "all" target before the test suites. problem report by Jeff Janes, patch in part by Michael Paquier
1 parent e0f26fc commit dbf2ec1
Copy full SHA for dbf2ec1

File tree

Expand file treeCollapse file tree

14 files changed

+15
-18
lines changed
Filter options
Expand file treeCollapse file tree

14 files changed

+15
-18
lines changed

‎GNUmakefile.in

Copy file name to clipboardExpand all lines: GNUmakefile.in
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ distclean maintainer-clean:
6262
# Garbage from autoconf:
6363
@rm -rf autom4te.cache/
6464

65-
check check-tests: all
66-
6765
check check-tests installcheck installcheck-parallel installcheck-tests:
6866
$(MAKE) -C src/test/regress $@
6967

‎contrib/test_decoding/Makefile

Copy file name to clipboardExpand all lines: contrib/test_decoding/Makefile
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ submake-test_decoding:
4040
REGRESSCHECKS=ddl rewrite toast permissions decoding_in_xact decoding_into_rel \
4141
binary prepared replorigin
4242

43-
regresscheck: all | submake-regress submake-test_decoding temp-install
43+
regresscheck: | submake-regress submake-test_decoding temp-install
4444
$(MKDIR_P) regression_output
4545
$(pg_regress_check) \
4646
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
@@ -54,7 +54,7 @@ regresscheck-install-force: | submake-regress submake-test_decoding temp-install
5454

5555
ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml
5656

57-
isolationcheck: all | submake-isolation submake-test_decoding temp-install
57+
isolationcheck: | submake-isolation submake-test_decoding temp-install
5858
$(MKDIR_P) isolation_output
5959
$(pg_isolation_regress_check) \
6060
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \

‎src/Makefile.global.in

Copy file name to clipboardExpand all lines: src/Makefile.global.in
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,9 @@ check: temp-install
308308
temp-install:
309309
ifeq ($(MAKELEVEL),0)
310310
rm -rf '$(abs_top_builddir)'/tmp_install
311-
$(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
312-
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
311+
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install
313312
endif
314-
$(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install >>'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1 || exit; done)
313+
$(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install || exit; done)
315314

316315
PROVE = @PROVE@
317316
PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/

‎src/bin/initdb/Makefile

Copy file name to clipboardExpand all lines: src/bin/initdb/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ clean distclean maintainer-clean:
5858
# ensure that changes in datadir propagate into object file
5959
initdb.o: initdb.c $(top_builddir)/src/Makefile.global
6060

61-
check: all
61+
check:
6262
$(prove_check)
6363

6464
installcheck:

‎src/bin/pg_basebackup/Makefile

Copy file name to clipboardExpand all lines: src/bin/pg_basebackup/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ clean distclean maintainer-clean:
5050
$(OBJS)
5151
rm -rf tmp_check
5252

53-
check: all
53+
check:
5454
$(prove_check)
5555

5656
installcheck:

‎src/bin/pg_config/Makefile

Copy file name to clipboardExpand all lines: src/bin/pg_config/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ clean distclean maintainer-clean:
4949
rm -f pg_config$(X) $(OBJS)
5050
rm -rf tmp_check
5151

52-
check: all
52+
check:
5353
$(prove_check)
5454

5555
installcheck:

‎src/bin/pg_controldata/Makefile

Copy file name to clipboardExpand all lines: src/bin/pg_controldata/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ clean distclean maintainer-clean:
3535
rm -f pg_controldata$(X) $(OBJS)
3636
rm -rf tmp_check
3737

38-
check: all
38+
check:
3939
$(prove_check)
4040

4141
installcheck:

‎src/bin/pg_ctl/Makefile

Copy file name to clipboardExpand all lines: src/bin/pg_ctl/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ clean distclean maintainer-clean:
3838
rm -f pg_ctl$(X) $(OBJS)
3939
rm -rf tmp_check
4040

41-
check: all
41+
check:
4242
$(prove_check)
4343

4444
installcheck:

‎src/bin/scripts/Makefile

Copy file name to clipboardExpand all lines: src/bin/scripts/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ clean distclean maintainer-clean:
6969
rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c
7070
rm -rf tmp_check
7171

72-
check: all
72+
check:
7373
$(prove_check)
7474

7575
installcheck:

‎src/interfaces/ecpg/Makefile

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ install-ecpglib-recurse: install-pgtypeslib-recurse
2626
clean distclean maintainer-clean:
2727
$(MAKE) -C test clean
2828

29-
check checktcp installcheck: all
29+
check checktcp installcheck:
3030
$(MAKE) -C test $@

‎src/makefiles/pgxs.mk

Copy file name to clipboardExpand all lines: src/makefiles/pgxs.mk
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ check:
291291
@echo '"$(MAKE) check" is not supported.'
292292
@echo 'Do "$(MAKE) install", then "$(MAKE) installcheck" instead.'
293293
else
294-
check: all submake $(REGRESS_PREP)
294+
check: submake $(REGRESS_PREP)
295295
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
296296

297297
temp-install: EXTRA_INSTALL+=$(subdir)

‎src/pl/plperl/GNUmakefile

Copy file name to clipboardExpand all lines: src/pl/plperl/GNUmakefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ uninstall-data:
114114
.PHONY: install-data uninstall-data
115115

116116

117-
check: all submake
117+
check: submake
118118
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
119119

120120
installcheck: submake

‎src/pl/plpython/Makefile

Copy file name to clipboardExpand all lines: src/pl/plpython/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ uninstall-data:
141141
include $(srcdir)/regress-python3-mangle.mk
142142

143143

144-
check: all submake
144+
check: submake
145145
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
146146

147147
installcheck: submake

‎src/pl/tcl/Makefile

Copy file name to clipboardExpand all lines: src/pl/tcl/Makefile
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ uninstall-data:
9292
.PHONY: install-data uninstall-data
9393

9494

95-
check: all submake
95+
check: submake
9696
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
9797

9898
installcheck: submake

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.