Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f6a1a8e

Browse files
committed
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.
1 parent 86a069b commit f6a1a8e

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

contrib/Makefile

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $PostgreSQL: pgsql/contrib/Makefile,v 1.52 2004/11/04 06:09:17 neilc Exp $
1+
# $PostgreSQL: pgsql/contrib/Makefile,v 1.53 2004/12/14 22:50:23 tgl Exp $
22

33
subdir = contrib
44
top_builddir = ..
@@ -57,7 +57,17 @@ WANTED_DIRS = \
5757
# xml2 \ (non-standard makefile)
5858

5959

60-
all install installdirs uninstall clean distclean maintainer-clean check installcheck:
60+
all install installdirs uninstall clean distclean maintainer-clean:
6161
@for dir in $(WANTED_DIRS); do \
6262
$(MAKE) -C $$dir $@ || exit; \
6363
done
64+
65+
# We'd like check operations to run all the subtests before failing;
66+
# also insert a sleep to ensure the previous test backend exited before
67+
# we try to drop the regression database.
68+
check installcheck:
69+
@CHECKERR=0; for dir in $(WANTED_DIRS); do \
70+
sleep 1; \
71+
$(MAKE) -C $$dir $@ || CHECKERR=$$?; \
72+
done; \
73+
exit $$CHECKERR

0 commit comments

Comments
 (0)