@@ -78,11 +78,22 @@ endif
7878REGRESS_OPTS = --dbname=ecpg1_regression,ecpg2_regression --create-role=regress_ecpg_user1,regress_ecpg_user2$(EXTRA_REGRESS_OPTS )
7979
8080check : all
81- $(with_temp_install ) ./pg_regress$(REGRESS_OPTS ) --temp-instance=./tmp_check$(TEMP_CONF ) --bindir=$(pg_regress_locale_flags ) $(THREAD ) --schedule=$(srcdir ) /ecpg_schedule
81+ $(with_temp_install ) ./pg_regress$(REGRESS_OPTS ) --temp-instance=./tmp_check$(TEMP_CONF ) --bindir=$(pg_regress_locale_flags ) $(THREAD ) --schedule=$(srcdir ) /ecpg_schedule sql/twophase
8282
8383# the same options, but with --listen-on-tcp
8484checktcp : all
8585$(with_temp_install ) ./pg_regress$(REGRESS_OPTS ) --temp-instance=./tmp_check$(TEMP_CONF ) --bindir=$(pg_regress_locale_flags ) $(THREAD ) --schedule=$(srcdir ) /ecpg_schedule_tcp --host=localhost
8686
8787installcheck : all
8888./pg_regress$(REGRESS_OPTS ) --bindir=' $(bindir)' $(pg_regress_locale_flags ) $(THREAD ) --schedule=$(srcdir ) /ecpg_schedule
89+
90+ # Versions of the check tests that include the twophase commit test.
91+ # It only makes sense to run these if set up to use prepared transactions,
92+ # via TEMP_CONFIG for the check case, or via the postgresql.conf for the
93+ # installcheck case.
94+
95+ installcheck-prepared-txns : all
96+ ./pg_regress$(REGRESS_OPTS ) --bindir=' $(bindir)' $(pg_regress_locale_flags ) $(THREAD ) --schedule=$(srcdir ) /ecpg_schedule sql/twophase
97+
98+ check-prepared-txns : all
99+ $(with_temp_install ) ./pg_regress$(REGRESS_OPTS ) --temp-instance=./tmp_check$(TEMP_CONF ) --bindir=$(pg_regress_locale_flags ) $(THREAD ) --schedule=$(srcdir ) /ecpg_schedule sql/twophase