From c317a3ac167d36244e8dd5add679b4e9ff36ea16 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut <peter_e@gmx.net> Date: Tue, 27 Dec 2011 20:27:24 +0200 Subject: [PATCH] Run "make all" as a prerequisite of "make check" This is the standard behavior but was forgotten in some places. --- contrib/pg_upgrade/Makefile | 2 +- src/pl/plperl/GNUmakefile | 2 +- src/pl/plpython/Makefile | 4 ++-- src/pl/tcl/Makefile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/pg_upgrade/Makefile b/contrib/pg_upgrade/Makefile index f00aad01d66..364b20df1ba 100644 --- a/contrib/pg_upgrade/Makefile +++ b/contrib/pg_upgrade/Makefile @@ -24,7 +24,7 @@ include $(top_builddir)/src/Makefile.global include $(top_srcdir)/contrib/contrib-global.mk endif -check: test.sh +check: test.sh all MAKE=$(MAKE) bindir=$(bindir) libdir=$(libdir) $(SHELL) $< --install # disabled because it upsets the build farm diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile index 55f48cd401a..0f3bd99570a 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -97,7 +97,7 @@ uninstall-data: .PHONY: install-data uninstall-data -check: submake +check: all submake $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) installcheck: submake diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile index a31328dd042..af6b4595336 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -149,7 +149,7 @@ prep3: clean3: rm -rf python3/ -check: submake prep3 +check: all submake prep3 $(pg_regress_check) --inputdir=./python3 --outputdir=./python3 $(REGRESS_OPTS) $(REGRESS) installcheck: submake prep3 @@ -157,7 +157,7 @@ installcheck: submake prep3 clean: clean3 else # not Python 3 -check: submake +check: all submake $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) installcheck: submake diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile index 77c173bcd8c..8a6325aa469 100644 --- a/src/pl/tcl/Makefile +++ b/src/pl/tcl/Makefile @@ -73,7 +73,7 @@ uninstall-data: .PHONY: install-data uninstall-data -check: submake +check: all submake $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) installcheck: submake -- GitLab