diff options
| author | Peter Eisentraut | 2011-02-14 19:52:32 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2011-02-15 04:52:12 +0000 |
| commit | 2fd77060a2db814146cf1f6cf77755a4b4fd9a80 (patch) | |
| tree | d3dd4b4c0e81172478f46142f281b134283db1c8 /src/makefiles | |
| parent | 0d90dc16f87bd991d7eb9f536ca46acef7586d95 (diff) | |
Allow make check in PL directories
Also add make check-world target, and refactor pg_regress invocation
code in makefiles a bit.
Diffstat (limited to 'src/makefiles')
| -rw-r--r-- | src/makefiles/pgxs.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 412bf5c9301..87ade0a420f 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -231,8 +231,7 @@ ifdef EXTRA_CLEAN endif ifdef REGRESS # things created by various check targets - rm -rf results tmp_check log - rm -f regression.diffs regression.out regress.out run_check.out + rm -rf $(pg_regress_clean_files) ifeq ($(PORTNAME), win) rm -f regress.def endif @@ -280,12 +279,11 @@ endif # against installed postmaster installcheck: submake - $(top_builddir)/src/test/regress/pg_regress --inputdir=$(srcdir) --psqldir=$(PSQLDIR) $(REGRESS_OPTS) $(REGRESS) + $(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS) # in-tree test doesn't work yet (no way to install my shared library) #check: all submake -# $(top_builddir)/src/test/regress/pg_regress --temp-install \ -# --top-builddir=$(top_builddir) $(REGRESS_OPTS) $(REGRESS) +# $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) check: @echo "'make check' is not supported." @echo "Do 'make install', then 'make installcheck' instead." |