summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Dunstan <andrew@dunslane.net>2012-07-20 15:51:40 -0400
committerAndrew Dunstan <andrew@dunslane.net>2012-07-20 15:51:40 -0400
commitae55d9fbe3871a5e6309d9b91629f1b0ff2b8cba (patch)
tree5562103f9c5a65eae57a581303472a937a7fad4d /src
parent8ca03aa41488a9f08dffe64724eb04692174350c (diff)
Remove prepared transactions from main isolation test schedule.
There is no point in running this test when prepared transactions are disabled, which is the default. New make targets that include the test are provided. This will save some useless waste of cycles on buildfarm machines. Backpatch to 9.1 where these tests were introduced.
Diffstat (limited to 'src')
-rw-r--r--src/test/isolation/Makefile10
-rw-r--r--src/test/isolation/isolation_schedule1
2 files changed, 10 insertions, 1 deletions
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index 74baed52f0a..482ac3ecb94 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -72,3 +72,13 @@ installcheck: all
check: all
./pg_isolation_regress --temp-install=./tmp_check --inputdir=$(srcdir) --top-builddir=$(top_builddir) --schedule=$(srcdir)/isolation_schedule
+
+# Versions of the check tests that include the prepared_transactions test
+# It only makes sense to run these if set up to use prepared transactions,
+# via TEMP_CONFIG for the check case, or via the postgresql.conf for the
+# installcheck case.
+installcheck-prepared-txns: all
+ ./pg_isolation_regress --psqldir='$(PSQLDIR)' --inputdir=$(srcdir) --schedule=$(srcdir)/isolation_schedule prepared-transactions
+
+check-prepared-txns: all
+ ./pg_isolation_regress --temp-install=./tmp_check --inputdir=$(srcdir) --top-builddir=$(top_builddir) --schedule=$(srcdir)/isolation_schedule prepared-transactions
diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule
index 669c0f220c4..2184975dcb1 100644
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@ -9,7 +9,6 @@ test: ri-trigger
test: partial-index
test: two-ids
test: multiple-row-versions
-test: prepared-transactions
test: fk-contention
test: fk-deadlock
test: fk-deadlock2