diff options
| author | Peter Eisentraut | 2015-04-30 00:34:22 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2015-04-30 00:34:22 +0000 |
| commit | dbf2ec1a1c053379e2f9a5913979a1ca4dccbd43 (patch) | |
| tree | 994397e079f5a0c9f1bc75a78434c73a16fa38ea /contrib/test_decoding | |
| parent | e0f26fc76532defd06caf79d711fa99cea83c532 (diff) | |
Fix parallel make risk with new check temp-install setup
The "check" target no longer needs to depend on "all", because it now
runs "install" directly, which in turn depends on "all". Doing both
will cause problems with parallel make, because two builds will run next
to each other.
Also remove the redirection of the temp-install output into a log file.
This was appropriate when this was done from within pg_regress, but now
it's just a regular make run, and especially with the above changes this
will now take the place of running the "all" target before the test
suites.
problem report by Jeff Janes, patch in part by Michael Paquier
Diffstat (limited to 'contrib/test_decoding')
| -rw-r--r-- | contrib/test_decoding/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile index 656eabfa005..a362e696916 100644 --- a/contrib/test_decoding/Makefile +++ b/contrib/test_decoding/Makefile @@ -40,7 +40,7 @@ submake-test_decoding: REGRESSCHECKS=ddl rewrite toast permissions decoding_in_xact decoding_into_rel \ binary prepared replorigin -regresscheck: all | submake-regress submake-test_decoding temp-install +regresscheck: | submake-regress submake-test_decoding temp-install $(MKDIR_P) regression_output $(pg_regress_check) \ --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \ @@ -54,7 +54,7 @@ regresscheck-install-force: | submake-regress submake-test_decoding temp-install ISOLATIONCHECKS=mxact delayed_startup ondisk_startup concurrent_ddl_dml -isolationcheck: all | submake-isolation submake-test_decoding temp-install +isolationcheck: | submake-isolation submake-test_decoding temp-install $(MKDIR_P) isolation_output $(pg_isolation_regress_check) \ --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \ |