diff options
| author | Peter Eisentraut | 2015-04-23 12:59:52 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2015-04-23 12:59:52 +0000 |
| commit | dcae5faccab64776376d354decda0017c648bb53 (patch) | |
| tree | 360f7fa5028f97814f09941be7f45f3fc82761c1 /src/makefiles | |
| parent | 50a16e30ebd76e70fc76abb2c8f0cd1e71deac41 (diff) | |
Improve speed of make check-world
Before, make check-world would create a new temporary installation for
each test suite, which is slow and wasteful. Instead, we now create one
test installation that is used by all test suites that are part of a
make run.
The management of the temporary installation is removed from pg_regress
and handled in the makefiles. This allows for better control, and
unifies the code with that of test suites not run through pg_regress.
review and msvc support by Michael Paquier <michael.paquier@gmail.com>
more review by Fabien Coelho <coelho@cri.ensmp.fr>
Diffstat (limited to 'src/makefiles')
| -rw-r--r-- | src/makefiles/pgxs.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk index 24ddba9294b..ea17b1c1858 100644 --- a/src/makefiles/pgxs.mk +++ b/src/makefiles/pgxs.mk @@ -258,9 +258,6 @@ else REGRESS_OPTS += --dbname=$(CONTRIB_TESTDB) endif -# where to find psql for running the tests -PSQLDIR = $(bindir) - # When doing a VPATH build, must copy over the data files so that the # driver script can find them. We have to use an absolute path for # the targets, because otherwise make will try to locate the missing @@ -295,7 +292,9 @@ check: @echo 'Do "$(MAKE) install", then "$(MAKE) installcheck" instead.' else check: all submake $(REGRESS_PREP) - $(pg_regress_check) --extra-install=$(subdir) $(REGRESS_OPTS) $(REGRESS) + $(pg_regress_check) $(REGRESS_OPTS) $(REGRESS) + +temp-install: EXTRA_INSTALL=$(subdir) endif endif # REGRESS |