Commit85f51de

committed

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

tools/thread to run even if configure didn't enable threads because thistest is used before enabling threads for the OS.

1 parent580cae7 commit85f51deCopy full SHA for 85f51de

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`# --makefile--`
`2`		`-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.171 2003/11/29 19:51:39 pgsql Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.172 2003/12/19 23:29:15 momjian Exp $`
`3`	`3`
`4`	`4`	`#------------------------------------------------------------------------------`
`5`	`5`	`# All PostgreSQL makefiles include this file and use the variables it sets,`
`@@ -121,7 +121,6 @@ localedir := @localedir@`
`121`	`121`	`#`
`122`	`122`	`# Records the choice of the various --enable-xxx and --with-xxx options.`
`123`	`123`
`124`		`-with_threads= @with_threads@`
`125`	`124`	`with_java= @with_java@`
`126`	`125`	`with_perl= @with_perl@`
`127`	`126`	`with_python= @with_python@`
`@@ -131,6 +130,7 @@ enable_shared= @enable_shared@`
`131`	`130`	`enable_rpath= @enable_rpath@`
`132`	`131`	`enable_nls= @enable_nls@`
`133`	`132`	`enable_debug= @enable_debug@`
	`133`	`+enable_thread_safety= @enable_thread_safety@`
`134`	`134`
`135`	`135`	`python_includespec= @python_includespec@`
`136`	`136`	`python_libspec= @python_libspec@`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.42 2003/11/29 19:52:09 pgsql Exp $`
	`1`	`+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.43 2003/12/19 23:29:15 momjian Exp $`
`2`	`2`
`3`	`3`	`subdir = src/interfaces/ecpg/test`
`4`	`4`	`top_builddir = ../../../..`
`@@ -8,7 +8,10 @@ override CPPFLAGS := -I$(srcdir)/../include -I$(libpq_srcdir) $(CPPFLAGS) $(THRE`
`8`	`8`
`9`	`9`	`ECPG = ../preproc/ecpg -I$(srcdir)/../include`
`10`	`10`
`11`		`-TESTS = test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init testdynalloc num_test dt_test test_informix test_thread`
	`11`	`+TESTS = test1 test2 test3 test4 perftest dyntest dyntest2 test_notice test_code100 test_init testdynalloc num_test dt_test test_informix`
	`12`	`+ifeq ($(enable_thread_safety), yes)`
	`13`	`+TESTS += test_thread`
	`14`	`+endif`
`12`	`15`
`13`	`16`	`all:$(TESTS)`
`14`	`17`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- *$PostgreSQL: pgsql/src/tools/thread/thread_test.c,v 1.5 2003/11/29 19:52:14 pgsql Exp $`
	`9`	`+ *$PostgreSQL: pgsql/src/tools/thread/thread_test.c,v 1.6 2003/12/19 23:29:15 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*This program tests to see if your standard libc functions use`
`12`	`12`	`*pthread_setspecific()/pthread_getspecific() to be thread-safe.`
`@@ -20,10 +20,7 @@`
`20`	`20`	`*-------------------------------------------------------------------------`
`21`	`21`	`*/`
`22`	`22`
`23`		`-`
`24`		`-#ifdefENABLE_THREAD_SAFETY`
`25`	`23`	`#include<pthread.h>`
`26`		`-#endif`
`27`	`24`	`#include<unistd.h>`
`28`	`25`	`#include<stdio.h>`
`29`	`26`	`#include<stdlib.h>`

Comments

(0)