提交 dbf2ec1a 编写于 作者: P Peter Eisentraut

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
上级 e0f26fc7
......@@ -62,8 +62,6 @@ distclean maintainer-clean:
# Garbage from autoconf:
@rm -rf autom4te.cache/
check check-tests: all
check check-tests installcheck installcheck-parallel installcheck-tests:
$(MAKE) -C src/test/regress $@
......
......@@ -40,7 +40,7 @@ submake-test_decoding:
REGRESSCHECKS=ddl rewrite toast permissions decoding_in_xact decoding_into_rel \
binary prepared replorigin
regresscheck: all | submake-regress submake-test_decoding temp-install
regresscheck: | submake-regress submake-test_decoding temp-install
$(MKDIR_P) regression_output
$(pg_regress_check) \
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
......@@ -54,7 +54,7 @@ regresscheck-install-force: | submake-regress submake-test_decoding temp-install
ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml
isolationcheck: all | submake-isolation submake-test_decoding temp-install
isolationcheck: | submake-isolation submake-test_decoding temp-install
$(MKDIR_P) isolation_output
$(pg_isolation_regress_check) \
--temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \
......
......@@ -308,10 +308,9 @@ check: temp-install
temp-install:
ifeq ($(MAKELEVEL),0)
rm -rf '$(abs_top_builddir)'/tmp_install
$(MKDIR_P) '$(abs_top_builddir)'/tmp_install/log
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install >'$(abs_top_builddir)'/tmp_install/log/install.log 2>&1
$(MAKE) -C '$(top_builddir)' DESTDIR='$(abs_top_builddir)'/tmp_install install
endif
$(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)
$(if $(EXTRA_INSTALL),for extra in $(EXTRA_INSTALL); do $(MAKE) -C '$(top_builddir)'/$$extra DESTDIR='$(abs_top_builddir)'/tmp_install install || exit; done)
PROVE = @PROVE@
PG_PROVE_FLAGS = -I $(top_srcdir)/src/test/perl/
......
......@@ -58,7 +58,7 @@ clean distclean maintainer-clean:
# ensure that changes in datadir propagate into object file
initdb.o: initdb.c $(top_builddir)/src/Makefile.global
check: all
check:
$(prove_check)
installcheck:
......
......@@ -50,7 +50,7 @@ clean distclean maintainer-clean:
$(OBJS)
rm -rf tmp_check
check: all
check:
$(prove_check)
installcheck:
......
......@@ -49,7 +49,7 @@ clean distclean maintainer-clean:
rm -f pg_config$(X) $(OBJS)
rm -rf tmp_check
check: all
check:
$(prove_check)
installcheck:
......
......@@ -35,7 +35,7 @@ clean distclean maintainer-clean:
rm -f pg_controldata$(X) $(OBJS)
rm -rf tmp_check
check: all
check:
$(prove_check)
installcheck:
......
......@@ -38,7 +38,7 @@ clean distclean maintainer-clean:
rm -f pg_ctl$(X) $(OBJS)
rm -rf tmp_check
check: all
check:
$(prove_check)
installcheck:
......
......@@ -69,7 +69,7 @@ clean distclean maintainer-clean:
rm -f dumputils.c print.c mbprint.c kwlookup.c keywords.c
rm -rf tmp_check
check: all
check:
$(prove_check)
installcheck:
......
......@@ -26,5 +26,5 @@ install-ecpglib-recurse: install-pgtypeslib-recurse
clean distclean maintainer-clean:
$(MAKE) -C test clean
check checktcp installcheck: all
check checktcp installcheck:
$(MAKE) -C test $@
......@@ -291,7 +291,7 @@ check:
@echo '"$(MAKE) check" is not supported.'
@echo 'Do "$(MAKE) install", then "$(MAKE) installcheck" instead.'
else
check: all submake $(REGRESS_PREP)
check: submake $(REGRESS_PREP)
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
temp-install: EXTRA_INSTALL+=$(subdir)
......
......@@ -114,7 +114,7 @@ uninstall-data:
.PHONY: install-data uninstall-data
check: all submake
check: submake
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
installcheck: submake
......
......@@ -141,7 +141,7 @@ uninstall-data:
include $(srcdir)/regress-python3-mangle.mk
check: all submake
check: submake
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
installcheck: submake
......
......@@ -92,7 +92,7 @@ uninstall-data:
.PHONY: install-data uninstall-data
check: all submake
check: submake
$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
installcheck: submake
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册