From f6a1a8e25443c0ba500222780bef1104e60f7624 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 14 Dec 2004 22:50:23 +0000 Subject: [PATCH] In 'make installcheck' for contrib/, insert 'sleep 1' between subdirectory checks, to ensure the previous test backend has time to quit out of the regression database. Also, allow all the checks to be run even if one of them fails. Per suggestions from Andrew Dunstan to improve the usefulness of buildfarm testing. --- contrib/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/contrib/Makefile b/contrib/Makefile index 600d402957..166ed861f8 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -1,4 +1,4 @@ -# $PostgreSQL: pgsql/contrib/Makefile,v 1.52 2004/11/04 06:09:17 neilc Exp $ +# $PostgreSQL: pgsql/contrib/Makefile,v 1.53 2004/12/14 22:50:23 tgl Exp $ subdir = contrib top_builddir = .. @@ -57,7 +57,17 @@ WANTED_DIRS = \ # xml2 \ (non-standard makefile) -all install installdirs uninstall clean distclean maintainer-clean check installcheck: +all install installdirs uninstall clean distclean maintainer-clean: @for dir in $(WANTED_DIRS); do \ $(MAKE) -C $$dir $@ || exit; \ done + +# We'd like check operations to run all the subtests before failing; +# also insert a sleep to ensure the previous test backend exited before +# we try to drop the regression database. +check installcheck: + @CHECKERR=0; for dir in $(WANTED_DIRS); do \ + sleep 1; \ + $(MAKE) -C $$dir $@ || CHECKERR=$$?; \ + done; \ + exit $$CHECKERR -- 2.40.0