diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2014-03-30 18:30:59 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2014-03-30 18:30:59 -0400 |
| commit | 7317d8d961f210c3a6b20972cd605bcd9bffb06e (patch) | |
| tree | 547f5a1f2787ae188fb92e8e1ae1b1b048af595a | |
| parent | 9d66116444b9763bc09defb688fb09343420e040 (diff) | |
| download | postgresql-7317d8d961f210c3a6b20972cd605bcd9bffb06e.tar.gz postgresql-7317d8d961f210c3a6b20972cd605bcd9bffb06e.zip | |
Use separate output dirs for test_decoding's two runs.
contrib/test_decoding's "make check" runs two sets of tests. Unless we
specify separate output directories for each set the isolation tests
will overwrite the output from the normal regression set. Doing this
will help the buildfarm collect complete logs.
| -rw-r--r-- | contrib/test_decoding/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile index c193f737864..685986cdcb4 100644 --- a/contrib/test_decoding/Makefile +++ b/contrib/test_decoding/Makefile @@ -5,7 +5,7 @@ OBJS = test_decoding.o # Note: because we don't tell the Makefile there are any regression tests, # we have to clean those result files explicitly -EXTRA_CLEAN = -r $(pg_regress_clean_files) +EXTRA_CLEAN = $(pg_regress_clean_files) ./regression_output ./isolation_output ifdef USE_PGXS PG_CONFIG = pg_config @@ -40,10 +40,12 @@ submake-test_decoding: REGRESSCHECKS=ddl rewrite toast permissions decoding_in_xact binary regresscheck: all | submake-regress submake-test_decoding + $(MKDIR_P) regression_output $(pg_regress_check) \ --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \ --temp-install=./tmp_check \ --extra-install=contrib/test_decoding \ + --outputdir=./regression_output \ $(REGRESSCHECKS) regresscheck-install-force: | submake-regress submake-test_decoding @@ -54,9 +56,11 @@ regresscheck-install-force: | submake-regress submake-test_decoding ISOLATIONCHECKS=mxact delayed_startup concurrent_ddl_dml isolationcheck: all | submake-isolation submake-test_decoding + $(MKDIR_P) isolation_output $(pg_isolation_regress_check) \ --temp-config $(top_srcdir)/contrib/test_decoding/logical.conf \ --extra-install=contrib/test_decoding \ + --outputdir=./isolation_output \ $(ISOLATIONCHECKS) isolationcheck-install-force: all | submake-isolation submake-test_decoding |