diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-12-19 23:29:29 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-12-19 23:29:29 +0000 |
| commit | cdbfbcf9870da573a5f6ff450a857349b4580e8a (patch) | |
| tree | a27823ddf51cb48054bb754385f5b3508f5b961e /src | |
| parent | 24cef7f46c6d8a03a47846bc17c0bd5e7ad23cbd (diff) | |
| download | postgresql-cdbfbcf9870da573a5f6ff450a857349b4580e8a.tar.gz postgresql-cdbfbcf9870da573a5f6ff450a857349b4580e8a.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/Makefile | 7 | ||||
| -rw-r--r-- | src/tools/thread/thread_test.c | 5 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 4e758189489..19c49d1468d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.170 2003/09/27 16:24:44 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.170.2.1 2003/12/19 23:29:29 momjian Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -121,7 +121,6 @@ localedir := @localedir@ # # Records the choice of the various --enable-xxx and --with-xxx options. -with_threads = @with_threads@ with_java = @with_java@ with_perl = @with_perl@ with_python = @with_python@ @@ -131,6 +130,7 @@ enable_shared = @enable_shared@ enable_rpath = @enable_rpath@ enable_nls = @enable_nls@ enable_debug = @enable_debug@ +enable_thread_safety = @enable_thread_safety@ python_includespec = @python_includespec@ python_libspec = @python_libspec@ diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile index 7f6835498da..9322101f281 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -1,4 +1,4 @@ -# $Header: /cvsroot/pgsql/src/interfaces/ecpg/test/Makefile,v 1.41 2003/09/27 15:32:48 momjian Exp $ +# $Header: /cvsroot/pgsql/src/interfaces/ecpg/test/Makefile,v 1.41.2.1 2003/12/19 23:29:29 momjian Exp $ subdir = src/interfaces/ecpg/test top_builddir = ../../../.. @@ -8,7 +8,10 @@ override CPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir) $(CPPFLAGS) $(THRE 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) diff --git a/src/tools/thread/thread_test.c b/src/tools/thread/thread_test.c index edfb885d054..4010e8518e1 100644 --- a/src/tools/thread/thread_test.c +++ b/src/tools/thread/thread_test.c @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Header: /cvsroot/pgsql/src/tools/thread/Attic/thread_test.c,v 1.3.2.1 2003/11/24 13:11:27 petere Exp $ + * $Header: /cvsroot/pgsql/src/tools/thread/Attic/thread_test.c,v 1.3.2.2 2003/12/19 23:29:29 momjian Exp $ * * This program tests to see if your standard libc functions use * pthread_setspecific()/pthread_getspecific() to be thread-safe. @@ -20,10 +20,7 @@ *------------------------------------------------------------------------- */ - -#ifdef ENABLE_THREAD_SAFETY #include <pthread.h> -#endif #include <unistd.h> #include <stdio.h> #include <stdlib.h> |