Add a Makefile target to run the tests with different config options.

diff --git a/test/Makefile.in b/test/Makefile.in
index 082d7fb546809e1ce5568357908f616ca7723934..b558ff7c6ccbcbebf15aa71981ea6a5cffbbbd2b 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -32,7 +32,7 @@ LIBODBC := $(shell $(ODBC_CONFIG) --libs)
 all: $(TESTBINS) $(TESTSQLS)
 
 odbc.ini:
-   ./odbcini-gen.sh
+   ./odbcini-gen.sh $(odbc_ini_extras)
 
 installcheck: all odbc.ini
 
@@ -62,3 +62,34 @@ ifndef PGXS
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 endif
 include $(PGXS)
+
+# This target runs the regression tests with all combinations of
+# UseDeclareFetch, UseServerSidePrepare and Protocol options.
+installcheck-all:
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=0 UseServerSidePrepare=1 Protocol=7.4-2"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=0 UseServerSidePrepare=1 Protocol=7.4-1"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=0 UseServerSidePrepare=1 Protocol=7.4-0"
+
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=0 UseServerSidePrepare=0 Protocol=7.4-2"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=0 UseServerSidePrepare=0 Protocol=7.4-1"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=0 UseServerSidePrepare=0 Protocol=7.4-0"
+
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=1 UseServerSidePrepare=1 Protocol=7.4-2"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=1 UseServerSidePrepare=1 Protocol=7.4-1"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=1 UseServerSidePrepare=1 Protocol=7.4-0"
+
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=1 UseServerSidePrepare=0 Protocol=7.4-2"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=1 UseServerSidePrepare=0 Protocol=7.4-1"
+   rm -f odbc.ini odbcinst.ini
+   $(MAKE) installcheck odbc_ini_extras="UseDeclareFetch=1 UseServerSidePrepare=0 Protocol=7.4-0"

diff --git a/test/README.txt b/test/README.txt
index cf02a55030a37f20fc6da1bc45b5ac06f7614a37..422eafffcf3dedf2df51ed42056ac21b1f5d143e 100644 (file)
--- a/test/README.txt
+++ b/test/README.txt
@@ -25,6 +25,9 @@ The PostgreSQL username used for the test is determined by the normal ODBC /
 libpq rules. You can set the PGUSER environment variable or .pgpass to
 override.
 
+You can also run "make installcheck-all" to run the regression suite with
+different combinations of configuration options.
+
 Windows
 =======