Commit 85f51dea authored by Bruce Momjian's avatar Bruce Momjian

Supress ecpg thread test if configure didn't enable threads. Fix

tools/thread to run even if configure didn't enable threads because this
test is used before enabling threads for the OS.
parent 580cae75
# -*-makefile-*- # -*-makefile-*-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.171 2003/11/29 19:51:39 pgsql Exp $ # $PostgreSQL: pgsql/src/Makefile.global.in,v 1.172 2003/12/19 23:29:15 momjian Exp $
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -121,7 +121,6 @@ localedir := @localedir@ ...@@ -121,7 +121,6 @@ localedir := @localedir@
# #
# Records the choice of the various --enable-xxx and --with-xxx options. # Records the choice of the various --enable-xxx and --with-xxx options.
with_threads = @with_threads@
with_java = @with_java@ with_java = @with_java@
with_perl = @with_perl@ with_perl = @with_perl@
with_python = @with_python@ with_python = @with_python@
...@@ -131,6 +130,7 @@ enable_shared = @enable_shared@ ...@@ -131,6 +130,7 @@ enable_shared = @enable_shared@
enable_rpath = @enable_rpath@ enable_rpath = @enable_rpath@
enable_nls = @enable_nls@ enable_nls = @enable_nls@
enable_debug = @enable_debug@ enable_debug = @enable_debug@
enable_thread_safety = @enable_thread_safety@
python_includespec = @python_includespec@ python_includespec = @python_includespec@
python_libspec = @python_libspec@ python_libspec = @python_libspec@
......
# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.42 2003/11/29 19:52:09 pgsql Exp $ # $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.43 2003/12/19 23:29:15 momjian Exp $
subdir = src/interfaces/ecpg/test subdir = src/interfaces/ecpg/test
top_builddir = ../../../.. top_builddir = ../../../..
...@@ -8,7 +8,10 @@ override CPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir) $(CPPFLAGS) $(THRE ...@@ -8,7 +8,10 @@ override CPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir) $(CPPFLAGS) $(THRE
ECPG = ../preproc/ecpg -I$(srcdir)/../include ECPG = ../preproc/ecpg -I$(srcdir)/../include
TESTS = test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init testdynalloc num_test dt_test test_informix test_thread TESTS = test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init testdynalloc num_test dt_test test_informix
ifeq ($(enable_thread_safety), yes)
TESTS += test_thread
endif
all: $(TESTS) all: $(TESTS)
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $PostgreSQL: pgsql/src/tools/thread/thread_test.c,v 1.5 2003/11/29 19:52:14 pgsql Exp $ * $PostgreSQL: pgsql/src/tools/thread/thread_test.c,v 1.6 2003/12/19 23:29:15 momjian Exp $
* *
* This program tests to see if your standard libc functions use * This program tests to see if your standard libc functions use
* pthread_setspecific()/pthread_getspecific() to be thread-safe. * pthread_setspecific()/pthread_getspecific() to be thread-safe.
...@@ -20,10 +20,7 @@ ...@@ -20,10 +20,7 @@
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#ifdef ENABLE_THREAD_SAFETY
#include <pthread.h> #include <pthread.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment