Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9e66c3e

Browse files
committed
Move thread_test directory from /tools to /test so source-only tarballs
have the directory for the configure test.
1 parent0e04982 commit9e66c3e

File tree

6 files changed

+14
-35
lines changed

6 files changed

+14
-35
lines changed

‎configure

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22753,13 +22753,13 @@ if test x"$template" != x"win32"
2275322753
then
2275422754
{ echo "$as_me:$LINENO: WARNING:
2275522755
*** Skipping thread test program. --enable-thread-safety-force was used.
22756-
*** Run the program in src/tools/thread on the your machine and add
22756+
*** Run the program in src/test/thread on the your machine and add
2275722757
proper locking function calls to your applications to guarantee thread
2275822758
safety.
2275922759
" >&5
2276022760
echo "$as_me: WARNING:
2276122761
*** Skipping thread test program. --enable-thread-safety-force was used.
22762-
*** Run the program in src/tools/thread on the your machine and add
22762+
*** Run the program in src/test/thread on the your machine and add
2276322763
proper locking function calls to your applications to guarantee thread
2276422764
safety.
2276522765
" >&2;}
@@ -22782,11 +22782,11 @@ if test "$cross_compiling" = yes; then
2278222782
echo "${ECHO_T}maybe" >&6
2278322783
{ echo "$as_me:$LINENO: WARNING:
2278422784
*** Skipping thread test program because of cross-compile build.
22785-
*** Run the program in src/tools/thread on the target machine.
22785+
*** Run the program in src/test/thread on the target machine.
2278622786
" >&5
2278722787
echo "$as_me: WARNING:
2278822788
*** Skipping thread test program because of cross-compile build.
22789-
*** Run the program in src/tools/thread on the target machine.
22789+
*** Run the program in src/test/thread on the target machine.
2279022790
" >&2;}
2279122791
else
2279222792
cat >conftest.$ac_ext <<_ACEOF
@@ -22795,7 +22795,7 @@ _ACEOF
2279522795
cat confdefs.h >>conftest.$ac_ext
2279622796
cat >>conftest.$ac_ext <<_ACEOF
2279722797
/* end confdefs.h. */
22798-
#include "$srcdir/src/tools/thread/thread_test.c"
22798+
#include "$srcdir/src/test/thread/thread_test.c"
2279922799
_ACEOF
2280022800
rm -f conftest$ac_exeext
2280122801
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -22824,7 +22824,7 @@ echo "${ECHO_T}no" >&6
2282422824
***
2282522825
*** You can use the configure option --enable-thread-safety-force
2282622826
*** to force threads to be enabled. However, you must then run
22827-
*** the program in src/tools/thread and add locking function calls
22827+
*** the program in src/test/thread and add locking function calls
2282822828
*** to your applications to guarantee thread safety.
2282922829
" >&5
2283022830
echo "$as_me: error:
@@ -22833,7 +22833,7 @@ echo "$as_me: error:
2283322833
***
2283422834
*** You can use the configure option --enable-thread-safety-force
2283522835
*** to force threads to be enabled. However, you must then run
22836-
*** the program in src/tools/thread and add locking function calls
22836+
*** the program in src/test/thread and add locking function calls
2283722837
*** to your applications to guarantee thread safety.
2283822838
" >&2;}
2283922839
{ (exit 1); exit 1; }; }

‎configure.in

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.445 2006/02/04 00:42:54 petere Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.446 2006/02/0401:00:01 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -1288,7 +1288,7 @@ if test x"$template" != x"win32"
12881288
then
12891289
AC_MSG_WARN([
12901290
*** Skipping thread test program. --enable-thread-safety-force was used.
1291-
*** Run the program in src/tools/thread on the your machine and add
1291+
*** Run the program in src/test/thread on the your machine and add
12921292
proper locking function calls to your applications to guarantee thread
12931293
safety.
12941294
])
@@ -1304,7 +1304,7 @@ _CFLAGS="$CFLAGS"
13041304
_LIBS="$LIBS"
13051305
CFLAGS="$CFLAGS $PTHREAD_CFLAGS -DIN_CONFIGURE"
13061306
LIBS="$LIBS $PTHREAD_LIBS"
1307-
AC_TRY_RUN([#include "$srcdir/src/tools/thread/thread_test.c"],
1307+
AC_TRY_RUN([#include "$srcdir/src/test/thread/thread_test.c"],
13081308
[AC_MSG_RESULT(yes)],
13091309
[AC_MSG_RESULT(no)
13101310
AC_MSG_ERROR([
@@ -1313,13 +1313,13 @@ AC_TRY_RUN([#include "$srcdir/src/tools/thread/thread_test.c"],
13131313
***
13141314
*** You can use the configure option --enable-thread-safety-force
13151315
*** to force threads to be enabled. However, you must then run
1316-
*** the program in src/tools/thread and add locking function calls
1316+
*** the program in src/test/thread and add locking function calls
13171317
*** to your applications to guarantee thread safety.
13181318
])],
13191319
[AC_MSG_RESULT(maybe)
13201320
AC_MSG_WARN([
13211321
*** Skipping thread test program because of cross-compile build.
1322-
*** Run the program in src/tools/thread on the target machine.
1322+
*** Run the program in src/test/thread on the target machine.
13231323
])])
13241324
CFLAGS="$_CFLAGS"
13251325
LIBS="$_LIBS"

‎src/include/pg_config.h.in

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,6 @@
213213
/* Define to 1 if you have the `crypto' library (-lcrypto). */
214214
#undef HAVE_LIBCRYPTO
215215

216-
/* Define to 1 if you have the `cygipc' library (-lcygipc). */
217-
#undef HAVE_LIBCYGIPC
218-
219-
/* Define to 1 if you have the `dl' library (-ldl). */
220-
#undef HAVE_LIBDL
221-
222-
/* Define to 1 if you have the `dld' library (-ldld). */
223-
#undef HAVE_LIBDLD
224-
225216
/* Define to 1 if you have the `eay32' library (-leay32). */
226217
#undef HAVE_LIBEAY32
227218

@@ -237,9 +228,6 @@
237228
/* Define to 1 if you have the `ld' library (-lld). */
238229
#undef HAVE_LIBLD
239230

240-
/* Define to 1 if you have the `m' library (-lm). */
241-
#undef HAVE_LIBM
242-
243231
/* Define to 1 if you have the `nsl' library (-lnsl). */
244232
#undef HAVE_LIBNSL
245233

@@ -255,9 +243,6 @@
255243
/* Define to 1 if you have the `resolv' library (-lresolv). */
256244
#undef HAVE_LIBRESOLV
257245

258-
/* Define to 1 if you have the `socket' library (-lsocket). */
259-
#undef HAVE_LIBSOCKET
260-
261246
/* Define to 1 if you have the `ssl' library (-lssl). */
262247
#undef HAVE_LIBSSL
263248

@@ -267,12 +252,6 @@
267252
/* Define to 1 if you have the `unix' library (-lunix). */
268253
#undef HAVE_LIBUNIX
269254

270-
/* Define to 1 if you have the `util' library (-lutil). */
271-
#undef HAVE_LIBUTIL
272-
273-
/* Define to 1 if you have the `wsock32' library (-lwsock32). */
274-
#undef HAVE_LIBWSOCK32
275-
276255
/* Define to 1 if you have the `z' library (-lz). */
277256
#undef HAVE_LIBZ
278257

‎src/tools/thread/Makefilerenamed to‎src/test/thread/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 2003-2005, PostgreSQL Global Development Group
66
#
7-
# $PostgreSQL: pgsql/src/tools/thread/Makefile,v 1.8 2005/01/01 20:44:34 tgl Exp $
7+
# $PostgreSQL: pgsql/src/test/thread/Makefile,v 1.1 2006/02/04 01:00:02 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

File renamed without changes.

‎src/tools/thread/thread_test.crenamed to‎src/test/thread/thread_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
*$PostgreSQL: pgsql/src/tools/thread/thread_test.c,v 1.41 2005/10/15 02:49:52 momjian Exp $
9+
*$PostgreSQL: pgsql/src/test/thread/thread_test.c,v 1.1 2006/02/04 01:00:02 momjian Exp $
1010
*
1111
*This program tests to see if your standard libc functions use
1212
*pthread_setspecific()/pthread_getspecific() to be thread-safe.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp