summaryrefslogtreecommitdiff
path: root/src/interfaces/ecpg/test/Makefile
diff options
context:
space:
mode:
authorMichael Meskes2007-03-29 12:02:24 +0000
committerMichael Meskes2007-03-29 12:02:24 +0000
commitddcb5bbf76dd991b5a7024bc3d4e212b97d27936 (patch)
tree0b6247677e8a9cf3ea60df6ae5474225f4e11ecb /src/interfaces/ecpg/test/Makefile
parentfba8113c1b74b9508cf2e6b7a18b0fb3637d9ba0 (diff)
- Added patch by Magnus Hagander <[email protected]> to use native
win32 threads. - Fixed regression tests to run threading tests.
Diffstat (limited to 'src/interfaces/ecpg/test/Makefile')
-rw-r--r--src/interfaces/ecpg/test/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index e5934c6fb32..f68ae926da8 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -1,4 +1,4 @@
-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.66 2007/02/09 15:55:59 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.67 2007/03/29 12:02:24 meskes Exp $
subdir = src/interfaces/ecpg/test
top_builddir = ../../../..
@@ -11,6 +11,9 @@ TEMP_PORT = 5$(DEF_PGPORT)
# default encoding
MULTIBYTE = SQL_ASCII
+# threading
+THREAD := $(shell grep -q "define ENABLE_THREAD_SAFETY" ../include/ecpg_config.h && echo "--enable-threading")
+
# locale
NOLOCALE =
ifdef NO_LOCALE
@@ -75,11 +78,11 @@ endif
check: all
- sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE)
+ sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) $(THREAD)
# the same options, but with --listen-on-tcp
checktcp: all
- sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) --listen-on-tcp
+ sh ./pg_regress --dbname=regress1 --temp-install --top-builddir=$(top_builddir) --temp-port=$(TEMP_PORT) --multibyte=$(MULTIBYTE) --load-language=plpgsql $(NOLOCALE) --listen-on-tcp $(THREAD)
installcheck: all
sh ./pg_regress --dbname=regress1 --top-builddir=$(top_builddir) --load-language=plpgsql $(NOLOCALE)